diff --git a/app/lbxproxy/Makefile.am b/app/lbxproxy/Makefile.am
index 336222030..18c3f2f1b 100644
--- a/app/lbxproxy/Makefile.am
+++ b/app/lbxproxy/Makefile.am
@@ -22,7 +22,7 @@
 bin_PROGRAMS = lbxproxy
 
 lbxproxy_CFLAGS = $(LBXPROXY_CFLAGS) -I$(top_srcdir)/include	\
-	-DDEF_ATOMS_FILE=\"$(libdir)/X11/lbxproxy/AtomControl\" \
+	-DDEF_ATOMS_FILE=\"$(datadir)/X11/lbxproxy/AtomControl\" \
 	-D_BSD_SOURCE -DLBXPROXY_t -DTRANS_SERVER
 
 lbxproxy_LDADD = $(LBXPROXY_LIBS)
@@ -81,7 +81,7 @@ lbxproxy_SOURCES = \
 appman_PRE = \
         lbxproxy.man
 
-configdir = $(libdir)/X11/lbxproxy
+configdir = $(datadir)/X11/lbxproxy
 dist_config_DATA = config/AtomControl
 
 EXTRA_DIST = \
diff --git a/app/lbxproxy/Makefile.bsd-wrapper b/app/lbxproxy/Makefile.bsd-wrapper
index 136b2e6a7..a3bc716fc 100644
--- a/app/lbxproxy/Makefile.bsd-wrapper
+++ b/app/lbxproxy/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 12:21:29 matthieu Exp $
+
+CONFIGURE_ARGS= --datadir=/etc
 
 .include <bsd.xorg.mk>
diff --git a/app/rstart/Makefile.am b/app/rstart/Makefile.am
index b27ac491d..7ded5fe64 100644
--- a/app/rstart/Makefile.am
+++ b/app/rstart/Makefile.am
@@ -21,12 +21,12 @@
 
 # rstartd server
 
-rstart_serverdir = $(libdir)/X11/rstart
+rstart_serverdir = $(datadir)/X11/rstart
 rstart_server_PROGRAMS = rstartd.real
 
 rstartd_real_CFLAGS = $(RSTART_CFLAGS)			\
 		-DSERVERNAME=\"rstart\"			\
-		-DDEFAULT_CONFIG=\"$(libdir)/X11/rstart/config\"
+		-DDEFAULT_CONFIG=\"$(rstart_serverdir)/config\"
 
 rstartd_real_LDADD = $(RSTART_LIBS)
 
@@ -50,7 +50,7 @@ CPP_SED_MAGIC = $(SED) -e '/^\#  *[0-9][0-9]*  *.*$$/d' \
 
 # config data
 
-configdir = $(libdir)/X11/rstart
+configdir = $(datadir)/X11/rstart
 config_DATA = config
 
 config: config.cpp
@@ -99,7 +99,7 @@ CLEANFILES = rstart rstartd config $(appman_DATA)
 # FIXME: Someone who cares about rstart may want to look into sanitizing
 # the stuff below.
 
-DATA_DIR = $(libdir)/X11/rstart
+DATA_DIR = $(datadir)/X11/rstart
 
 install-data-hook:
 	for name in `find ${srcdir}/commands -print | grep -v CVS` ; do	\
diff --git a/app/rstart/Makefile.bsd-wrapper b/app/rstart/Makefile.bsd-wrapper
index 136b2e6a7..634798cde 100644
--- a/app/rstart/Makefile.bsd-wrapper
+++ b/app/rstart/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 12:17:58 matthieu Exp $
+
+CONFIGURE_ARGS= --datadir=/etc
 
 .include <bsd.xorg.mk>