diff --git a/configure.ac b/configure.ac
index eabfab2..0546800 100644
--- a/configure.ac
+++ b/configure.ac
@@ -164,6 +164,7 @@ AS_AC_EXPAND(DATADIR, $datadir)
 AS_AC_EXPAND(BINDIR, $bindir)
 AS_AC_EXPAND(SBINDIR, $sbindir)
 AS_AC_EXPAND(LIBDIR, $libdir)
+AS_AC_EXPAND(PKGLIBEXECDIR, "$libexecdir/$PACKAGE")
 
 ### Paths
 
@@ -367,12 +368,7 @@ AC_SUBST(CFLAGS_save)
 AC_SUBST(PYTHON_LIBS)
 AC_SUBST(PYTHON_CPPFLAGS)
 
-# Get a pre-expanded version of $pythondir and $top_srcdir so we can
-# substitute them into generated files
-EXPANDED_PYTHONDIR=`eval echo $pythondir`
-EXPANDED_TOP_SRCDIR=`pwd`
-AC_SUBST(EXPANDED_PYTHONDIR)
-AC_SUBST(EXPANDED_TOP_SRCDIR)
+AS_AC_EXPAND(PYTHONDIR, $pythondir)
 
 # Check for openldap's slapd
 AC_ARG_WITH([slapd],
diff --git a/init/bongo.init.suse10.in b/init/bongo.init.suse10.in
index dab96a9..915ede1 100644
--- a/init/bongo.init.suse10.in
+++ b/init/bongo.init.suse10.in
@@ -27,7 +27,7 @@ BONGO_BIN=@prefix@/sbin
 BONGO_NAME=bongo-manager
 BONGO_SETUP=bongo-setup
 BONGO_LIST="bongomanager bongodmc bongostore bongoqueue bongosmtp bongoimap bongopop3 bongoantispam bongoavirus bongocalagent bongomailprox bongorules bongoforward bongopluspack bongoconnmgr"
-BONGO_DATA=@EXPANDED_SYSCONFDIR@/mdb.conf
+BONGO_DATA=@SYSCONFDIR@/mdb.conf
 OPTIONS=
 test -x $BONGO_BIN/$BONGO_NAME || exit 5
 
diff --git a/src/libs/python/bongo-python-wrapper.in b/src/libs/python/bongo-python-wrapper.in
index 1b88f38..aca804b 100644
--- a/src/libs/python/bongo-python-wrapper.in
+++ b/src/libs/python/bongo-python-wrapper.in
@@ -11,10 +11,10 @@ if binpath.endswith("bin"):
     newpath = []
     if envpath is not None:
         newpath = envpath.split(os.pathsep)
-    newpath.insert(0, "@EXPANDED_PYTHONDIR@")
+    newpath.insert(0, "@PYTHONDIR@")
     os.environ["PYTHONPATH"] = os.pathsep.join(newpath)
 
-    script = os.path.join("@EXPANDED_PKGLIBEXECDIR@",
+    script = os.path.join("@PKGLIBEXECDIR@",
                           os.path.basename(sys.argv[0]) + ".py")
 else:
     script = os.path.join(binpath, binname + ".py")
diff --git a/src/libs/python/bongo/Xpl.py.in b/src/libs/python/bongo/Xpl.py.in
index 30bfb28..609003e 100644
--- a/src/libs/python/bongo/Xpl.py.in
+++ b/src/libs/python/bongo/Xpl.py.in
@@ -20,7 +20,7 @@ DEFAULT_RANDSEED_PATH = '@XPL_DEFAULT_RANDSEED_PATH@'
 DEFAULT_SLAPD_PATH = '@DEFAULT_SLAPD_PATH@'
 DEFAULT_SLAPD_SCHEMA_DIR = '@DEFAULT_SLAPD_SCHEMA_DIR@'
 
-DEFAULT_LIBEXEC_DIR = '@EXPANDED_PKGLIBEXECDIR@'
+DEFAULT_LIBEXEC_DIR = '@PKGLIBEXECDIR@'
 
 # Configured Bongo user.  If this looks funky, it's because we're
 # substituting in some potentially empty variables from autoconf.
diff --git a/src/www/Bongo.rules b/src/www/Bongo.rules
index ffbf6e5..8c5ac0f 100644
--- a/src/www/Bongo.rules
+++ b/src/www/Bongo.rules
@@ -391,11 +391,11 @@ src/www/bongo/__init__.py: src/www/bongo/__init__.py.in $(top_srcdir)/src/libs/p
 	mv $@.tmp $@
 
 src/www/bongo-devel.conf: src/www/bongo.conf.in Makefile
-	sed -e "s%\@EXPANDED_DATADIR\@/\@PACKAGE\@/htdocs%${EXPANDED_TOP_SRCDIR}/src/www%" \
+	sed -e "s%\@DATADIR\@/\@PACKAGE\@/htdocs%${top_srcdir}/src/www%" \
 	-e "s%\@APACHE_MOD_DIR\@%${APACHE_MOD_DIR}%" \
-	-e "s%\@EXPANDED_PYTHONDIR\@%${EXPANDED_TOP_SRCDIR}/src/www%" \
+	-e "s%\@PYTHONDIR\@%${top_srcdir}/src/www%" \
 	-e "s%\@SHARED_POSTFIX\@%${SHARED_POSTFIX}%" \
-	-e "s%\@EXPANDED_DATADIR\@/\@PACKAGE\@/hawkeye%${EXPANDED_TOP_SRCDIR}/src/www/hawkeye%" \
+	-e "s%\@DATADIR\@/\@PACKAGE\@/hawkeye%${top_srcdir}/src/www/hawkeye%" \
 	$< > $@
 
 props2json := $(top_srcdir)/src/www/l10n/props2json
diff --git a/src/www/bongo.conf.in b/src/www/bongo.conf.in
index 18ab170..0d96761 100644
--- a/src/www/bongo.conf.in
+++ b/src/www/bongo.conf.in
@@ -3,7 +3,7 @@
 #LoadModule python_module @APACHE_MOD_DIR@/mod_python@SHARED_POSTFIX@
 
 <IfModule mod_python.c>
-Alias / @EXPANDED_DATADIR@/@PACKAGE@/htdocs/
+Alias / @DATADIR@/@PACKAGE@/htdocs/
 
 <Location />
     Order allow,deny
@@ -16,7 +16,7 @@ Alias / @EXPANDED_DATADIR@/@PACKAGE@/htdocs/
     Allow from all
 
     SetHandler python-program
-    PythonPath "['@EXPANDED_PYTHONDIR@']+sys.path"
+    PythonPath "['@PYTHONDIR@']+sys.path"
     PythonHandler bongo.dragonfly.Server
     PythonOption DragonflyUriRoot "/user"
     PythonDebug On
@@ -27,7 +27,7 @@ Alias / @EXPANDED_DATADIR@/@PACKAGE@/htdocs/
     Allow from all
 
     SetHandler python-program
-    PythonPath "['@EXPANDED_PYTHONDIR@']+sys.path"
+    PythonPath "['@PYTHONDIR@']+sys.path"
     PythonHandler bongo.dragonfly.HistoryServer
     PythonOption DragonflyUriRoot "/history"
     PythonDebug On
@@ -38,10 +38,10 @@ Alias / @EXPANDED_DATADIR@/@PACKAGE@/htdocs/
     Allow from all
 
     SetHandler python-program
-    PythonPath "['@EXPANDED_PYTHONDIR@']+sys.path"
+    PythonPath "['@PYTHONDIR@']+sys.path"
     PythonHandler bongo.hawkeye.Server
     PythonOption HawkeyeUriRoot "/admin"
-    PythonOption HawkeyeTmplRoot "@EXPANDED_DATADIR@/@PACKAGE@/hawkeye/psp"
+    PythonOption HawkeyeTmplRoot "@DATADIR@/@PACKAGE@/hawkeye/psp"
     PythonDebug On
 </Location>
 </IfModule>