diff --git a/util/Makefile b/util/Makefile
new file mode 100644
index 000000000..7d18ab56c
--- /dev/null
+++ b/util/Makefile
@@ -0,0 +1,8 @@
+# $OpenBSD
+
+SUBDIR= macros cf imake makedepend gccmakedep
+
+.include <bsd.subdir.mk>
+
+build: _SUBDIRUSE
+update: _SUBDIRUSE
diff --git a/util/cf/Makefile.bsd-wrapper b/util/cf/Makefile.bsd-wrapper
new file mode 100644
index 000000000..3fcc38b7c
--- /dev/null
+++ b/util/cf/Makefile.bsd-wrapper
@@ -0,0 +1,4 @@
+# $Xenocara: Makefile.bsd-wrapper,v 1.3 2006/04/17 13:56:27 matthieu Exp $
+
+.include <bsd.xorg.mk>
+
diff --git a/util/gccmakedep/Makefile.bsd-wrapper b/util/gccmakedep/Makefile.bsd-wrapper
new file mode 100644
index 000000000..3fcc38b7c
--- /dev/null
+++ b/util/gccmakedep/Makefile.bsd-wrapper
@@ -0,0 +1,4 @@
+# $Xenocara: Makefile.bsd-wrapper,v 1.3 2006/04/17 13:56:27 matthieu Exp $
+
+.include <bsd.xorg.mk>
+
diff --git a/util/imake/Makefile.bsd-wrapper b/util/imake/Makefile.bsd-wrapper
new file mode 100644
index 000000000..3fcc38b7c
--- /dev/null
+++ b/util/imake/Makefile.bsd-wrapper
@@ -0,0 +1,4 @@
+# $Xenocara: Makefile.bsd-wrapper,v 1.3 2006/04/17 13:56:27 matthieu Exp $
+
+.include <bsd.xorg.mk>
+
diff --git a/util/macros/Makefile.bsd-wrapper b/util/macros/Makefile.bsd-wrapper
new file mode 100644
index 000000000..3fcc38b7c
--- /dev/null
+++ b/util/macros/Makefile.bsd-wrapper
@@ -0,0 +1,4 @@
+# $Xenocara: Makefile.bsd-wrapper,v 1.3 2006/04/17 13:56:27 matthieu Exp $
+
+.include <bsd.xorg.mk>
+
diff --git a/util/makedepend/Makefile.bsd-wrapper b/util/makedepend/Makefile.bsd-wrapper
new file mode 100644
index 000000000..506002e58
--- /dev/null
+++ b/util/makedepend/Makefile.bsd-wrapper
@@ -0,0 +1,3 @@
+# $Xenocara: Makefile.bsd-wrapper,v 1.3 2006/04/17 13:56:27 matthieu Exp $
+
+.include <bsd.xorg.mk>