diff --git a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
index bcaa6a738..091383dd5 100644
--- a/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
+++ b/xorg-x11-drv-keyboard/xorg-x11-drv-keyboard.nm
@@ -4,7 +4,7 @@
 ###############################################################################
 
 name       = xorg-x11-drv-keyboard
-version    = 1.4.0
+version    = 1.6.2
 release    = 1
 
 maintainer = Stefan Schantl <stefan.schantl@ipfire.org>
@@ -17,19 +17,21 @@ description
 	X.Org X11 keyboard input driver.
 end
 
+# Specify the X Server version to build for.
+x11_server_ver = 1.13.2
+
+thisapp = xf86-input-keyboard-%{version}
+
 source_dl  = http://ftp.x.org/pub/individual/driver/
-sources    = xf86-input-keyboard-%{version}.tar.bz2
 
 build
 	requires
 		pkg-config
-		xorg-x11-server-devel
+		xorg-x11-server-devel >= %{x11_server_ver}
 		xorg-x11-proto-devel
 		xorg-x11-util-macros
 	end
 
-	DIR_APP = %{DIR_SRC}/xf86-input-keyboard-%{version}
-
 	CFLAGS += -Wl,-z,lazy
 
 	configure_options += \
@@ -42,6 +44,10 @@ end
 
 packages
 	package %{name}
+		requires
+			xorg-x11-server >= %{x11_server_ver}
+		end
+	end
 
 	package %{name}-debuginfo
 		template DEBUGINFO