diff --git a/recipes/freeglut/all/conandata.yml b/recipes/freeglut/all/conandata.yml
index 964de8ca2d213..44ca346f193eb 100644
--- a/recipes/freeglut/all/conandata.yml
+++ b/recipes/freeglut/all/conandata.yml
@@ -1,4 +1,7 @@
 sources:
+  "3.6.0":
+    url: "https://github.com/FreeGLUTProject/freeglut/archive/v3.6.0.tar.gz"
+    sha256: "16de4f51dc1efd663a1a58ba5552e54f8783b77478289c95dca474a4d39ddd02"
   "3.4.0":
     url: "https://github.com/FreeGLUTProject/freeglut/archive/v3.4.0.tar.gz"
     sha256: "3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec"
diff --git a/recipes/freeglut/all/conanfile.py b/recipes/freeglut/all/conanfile.py
index dc8ac66bf9e42..30a6d034bc07a 100644
--- a/recipes/freeglut/all/conanfile.py
+++ b/recipes/freeglut/all/conanfile.py
@@ -142,6 +142,7 @@ def generate(self):
         tc.variables["INSTALL_PDB"] = False
         tc.variables["FREEGLUT_REPLACE_GLUT"] = self.options.replace_glut
         tc.preprocessor_definitions["FREEGLUT_LIB_PRAGMAS"] = "0"
+        tc.cache_variables["CMAKE_POLICY_DEFAULT_CMP0077"] = "NEW"
         tc.generate()
         cmake_deps = CMakeDeps(self)
         cmake_deps.generate()
@@ -203,7 +204,13 @@ def package_info(self):
         else:
             self.cpp_info.components["freeglut_"].requires.append("opengl::opengl")
         if self._with_x11:
-            self.cpp_info.components["freeglut_"].requires.append("xorg::xorg")
+            # https://github.com/freeglut/freeglut/blob/v3.4.0/CMakeLists.txt#L261-L278
+            self.cpp_info.components["freeglut_"].requires.extend([
+                "xorg::x11",
+                "xorg::xrandr",
+                "xorg::xxf86vm",
+                "xorg::xinput",
+            ])
         if self.options.get_safe("with_wayland"):
             self.cpp_info.components["freeglut_"].requires.extend(["wayland::wayland-client", "wayland::wayland-cursor", "wayland::wayland-egl", "xkbcommon::xkbcommon"])
         if is_apple_os(self) or self.settings.os == "Windows":
diff --git a/recipes/freeglut/config.yml b/recipes/freeglut/config.yml
index dc897e491fcb6..e41ce2c1d0b1f 100644
--- a/recipes/freeglut/config.yml
+++ b/recipes/freeglut/config.yml
@@ -1,4 +1,6 @@
 versions:
+  "3.6.0":
+    folder: all
   "3.4.0":
     folder: all
   "3.2.2":