diff --git a/CMakeLists.txt b/CMakeLists.txt
index 324a2406b4..d05c5cda02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -430,12 +430,13 @@ if(NOT ANDROID)
 		else()
 			add_definitions(-DHAVE_XRANDR=0)
 		endif(XRANDR_FOUND)
-		include(FindX11XInput2)
-		if(X11_Xinput2_FOUND)
+
+		pkg_check_modules(XINPUT2 xi>=1.5.0)
+		if(XINPUT2_FOUND)
 			add_definitions(-DHAVE_X11_XINPUT2=1)
 		else()
 			add_definitions(-DHAVE_X11_XINPUT2=0)
-		endif(X11_Xinput2_FOUND)
+		endif(XINPUT2_FOUND)
 	endif()
 	if(ENCODE_FRAMEDUMPS)
 		check_libav()
diff --git a/CMakeTests/FindX11XInput2.cmake b/CMakeTests/FindX11XInput2.cmake
deleted file mode 100644
index 1b1f26f2cd..0000000000
--- a/CMakeTests/FindX11XInput2.cmake
+++ /dev/null
@@ -1,30 +0,0 @@
-# For finding the X11 XInput extension, version 2. Because the standard CMake
-# FindX11.cmake may only know to look for version 1. Newer versions of CMake
-# than 2.8.7 might not have this problem, I wouldn't know. Better to be safe.
-
-
-if(USE_X11)
-    
-    IF(NOT X11_FOUND)
-        INCLUDE(FindX11)
-    ENDIF(NOT X11_FOUND)
-
-    IF(X11_FOUND)
-        FIND_PATH(X11_Xinput2_INCLUDE_PATH X11/extensions/XInput2.h ${X11_INC_SEARCH_PATH})
-        
-        FIND_LIBRARY(X11_Xinput2_LIB Xi ${X11_LIB_SEARCH_PATH})
-        
-        IF (X11_Xinput2_INCLUDE_PATH AND X11_Xinput2_LIB)
-            SET(X11_Xinput2_FOUND TRUE)
-            SET(X11_INCLUDE_DIR ${X11_INCLUDE_DIR} ${X11_Xinput2_INCLUDE_PATH})
-            message("X11 Xinput2 found")
-        ENDIF (X11_Xinput2_INCLUDE_PATH AND X11_Xinput2_LIB)
-        
-        MARK_AS_ADVANCED(
-            X11_Xinput2_INCLUDE_PATH
-            X11_Xinput2_LIB
-        )
-        
-    ENDIF(X11_FOUND)
-
-endif()