diff --git a/data/xkeyboard-config/Makefile b/data/xkeyboard-config/Makefile
index 76231ca36..7b6fc455c 100644
--- a/data/xkeyboard-config/Makefile
+++ b/data/xkeyboard-config/Makefile
@@ -1,16 +1,7 @@
-#	$OpenBSD: Makefile,v 1.4 2012/09/27 16:23:51 matthieu Exp $
+#	$OpenBSD: Makefile,v 1.5 2012/09/28 19:49:12 matthieu Exp $
 
-SUBDIR =		compat geometry keycodes man rules symbols types
-XKC_TOP =		../..
-PACKAGE_VERSION =	2.6
-PKGCONFIG =		xkeyboard-config.pc
-EXTRA_PKGCONFIG_SUBST = -e 's,@VERSION@,${PACKAGE_VERSION},g' \
-			-e 's,@xkb_base@,${XKB_BASE},g'
+SUBDIR=	compat geometry keycodes man pc rules symbols types
 
-clean: _SUBDIRUSE
+build: _SUBDIRUSE
 
-install: install-pc _SUBDIRUSE
-
-.include "${.CURDIR}/Makefile.inc"
-.include <bsd.xorg.mk>
 .include <bsd.subdir.mk>
diff --git a/data/xkeyboard-config/pc/Makefile b/data/xkeyboard-config/pc/Makefile
new file mode 100644
index 000000000..59277aec9
--- /dev/null
+++ b/data/xkeyboard-config/pc/Makefile
@@ -0,0 +1,11 @@
+#	$OpenBSD: Makefile,v 1.1 2012/09/28 19:49:12 matthieu Exp $
+ 
+XKC_TOP =		../../..
+PACKAGE_VERSION =	2.6
+PKGCONFIG =		xkeyboard-config.pc
+EXTRA_PKGCONFIG_SUBST = -e 's,@VERSION@,${PACKAGE_VERSION},g' \
+			-e 's,@xkb_base@,${XKB_BASE},g'
+
+install: install-pc
+ 
+.include <bsd.xorg.mk>