diff --git a/app/xfs/Makefile.am b/app/xfs/Makefile.am
index 5d5ba4d2e..de14474e9 100644
--- a/app/xfs/Makefile.am
+++ b/app/xfs/Makefile.am
@@ -19,7 +19,7 @@
 #  TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
 #  PERFORMANCE OF THIS SOFTWARE.
 
-configdir = $(libdir)/X11/fs
+configdir = $(datadir)/X11/fs
 
 bin_PROGRAMS = xfs
 
diff --git a/app/xfs/Makefile.bsd-wrapper b/app/xfs/Makefile.bsd-wrapper
index 136b2e6a7..94c8df4d4 100644
--- a/app/xfs/Makefile.bsd-wrapper
+++ b/app/xfs/Makefile.bsd-wrapper
@@ -1,3 +1,5 @@
-# $OpenBSD: Makefile.bsd-wrapper,v 1.2 2006/11/27 19:27:26 matthieu Exp $
+# $OpenBSD: Makefile.bsd-wrapper,v 1.3 2006/11/29 11:41:28 matthieu Exp $
+
+CONFIGURE_ARGS=	--datadir=/etc
 
 .include <bsd.xorg.mk>