diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20f6efe2a..dc896d40b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -118,6 +118,7 @@ if(NOT WIN32)
 
 	if(NOT APPLE)
 		find_suggested_package(FFmpeg)
+		find_suggested_package(XRandR)
 		find_suggested_package(Gstreamer)
 		find_suggested_package(ALSA)
 	else(NOT APPLE)
diff --git a/channels/drdynvc/tsmf/CMakeLists.txt b/channels/drdynvc/tsmf/CMakeLists.txt
index eaaec0932..c4e940730 100644
--- a/channels/drdynvc/tsmf/CMakeLists.txt
+++ b/channels/drdynvc/tsmf/CMakeLists.txt
@@ -48,9 +48,11 @@ if(WITH_FFMPEG)
 	add_subdirectory(ffmpeg)
 endif()
 
+if(WITH_XRANDR)
 if(GSTREAMER_FOUND)
         add_subdirectory(gstreamer)
 endif()
+endif()
 
 if(WITH_ALSA)
 	add_subdirectory(alsa)
diff --git a/cmake/FindXRandR.cmake b/cmake/FindXRandR.cmake
new file mode 100644
index 000000000..e9e38c379
--- /dev/null
+++ b/cmake/FindXRandR.cmake
@@ -0,0 +1,47 @@
+# - Find XRANDR
+# Find the XRANDR libraries
+#
+#  This module defines the following variables:
+#     XRANDR_FOUND        - true if XRANDR_INCLUDE_DIR & XRANDR_LIBRARY are found
+#     XRANDR_LIBRARIES    - Set when XRANDR_LIBRARY is found
+#     XRANDR_INCLUDE_DIRS - Set when XRANDR_INCLUDE_DIR is found
+#
+#     XRANDR_INCLUDE_DIR  - where to find Xrandr.h, etc.
+#     XRANDR_LIBRARY      - the XRANDR library
+#
+
+#=============================================================================
+# Copyright 2012 Alam Arias <Alam.GBC@gmail.com>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#=============================================================================
+
+find_path(XRANDR_INCLUDE_DIR NAMES X11/extensions/Xrandr.h
+          PATH_SUFFIXES X11/extensions
+          DOC "The XRANDR include directory"
+)
+
+find_library(XRANDR_LIBRARY NAMES Xrandr
+          DOC "The XRANDR library"
+)
+
+include(FindPackageHandleStandardArgs)
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(XRANDR DEFAULT_MSG XRANDR_LIBRARY XRANDR_INCLUDE_DIR)
+
+if(XRANDR_FOUND)
+  set( XRANDR_LIBRARIES ${XRANDR_LIBRARY} )
+  set( XRANDR_INCLUDE_DIRS ${XRANDR_INCLUDE_DIR} )
+endif()
+
+mark_as_advanced(XRANDR_INCLUDE_DIR XRANDR_LIBRARY)
+