--- a/CMakeLists.txt	Sat Mar 05 17:32:20 2016 +0200
+++ b/CMakeLists.txt	Sat Mar 05 18:04:48 2016 +0200
@@ -30,31 +30,17 @@
 ## Gather information about system
 find_package(PkgConfig REQUIRED)
 if(WANT_LUA STREQUAL "LUA5.3")
-	pkg_check_modules(LUA REQUIRED lua5.3)
-	set(LUA_VERSION "5.3")
+	find_package(Lua 5.3 EXACT REQUIRED)
 elseif(WANT_LUA STREQUAL "LUA5.2")
-	pkg_check_modules(LUA REQUIRED lua5.2)
-	set(LUA_VERSION "5.2")
+	find_package(Lua 5.2 EXACT REQUIRED)
 elseif(WANT_LUA STREQUAL "LUA5.1")
-	find_package(Lua51 REQUIRED)
-	set(LUA_VERSION "5.1")
+	find_package(Lua 5.1 EXACT REQUIRED)
 else()
-	pkg_check_modules(LUA lua5.3)
-	if(LUA_FOUND)
-		set(LUA_VERSION "5.3")
-	else()
-		pkg_check_modules(LUA lua5.2)
-		if(LUA_FOUND)
-			set(LUA_VERSION "5.2")
-		else()
-			find_package(Lua51 REQUIRED)
-			set(LUA_VERSION "5.1")
-		endif()
-	endif()
+	find_package(Lua 5.1 REQUIRED)
 endif()
-if(LUA_VERSION STREQUAL "5.1")
+set(LUA_VERSION "${LUA_VERSION_MAJOR}.${LUA_VERSION_MINOR}")
+if(LUA_VERSION VERSION_EQUAL "5.1")
 	set(LUA51_COMPATIBILITY TRUE)
-	set(LUA_INCLUDE_DIRS ${LUA_INCLUDE_DIR})
 endif()
 find_program(LUA_EXECUTABLE lua${LUA_VERSION} lua luanoreadline)
 if(LUA_EXECUTABLE)
@@ -89,7 +75,7 @@
 	set(DEBUG_COMPILE_FLAGS "-g")
 endif()
 configure_file(config.h.in config.h)
-include_directories(SYSTEM ${LUA_INCLUDE_DIRS} ${GLIB_INCLUDE_DIRS} ${LM_INCLUDE_DIRS})
+include_directories(SYSTEM ${LUA_INCLUDE_DIR} ${GLIB_INCLUDE_DIRS} ${LM_INCLUDE_DIRS})
 target_link_libraries(loudmouth ${LUA_LIBRARIES} ${GLIB_LIBRARIES} ${LM_LIBRARIES})
 include_directories(${lua-lm_SOURCE_DIR} ${lua-lm_BINARY_DIR})
 set_target_properties(loudmouth PROPERTIES