diff --git a/Makefile.am b/Makefile.am
index c4cd9773..6fb85748 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -364,7 +364,7 @@ dist_rc_DATA = \
 
 edit = $(SED) \
 	-e 's!@version\@!$(VERSION)!' \
-	-e 's!@confdir\@!$(confdir)!' \
+	-e 's!@configdir\@!$(configdir)!' \
 	-e 's!@bindir\@!$(bindir)!'
 
 data/xsession/openbox-gnome-session: Makefile data \
diff --git a/doc/openbox.1.sgml b/doc/openbox.1.sgml
index a8f2fe74..b2b4a836 100644
--- a/doc/openbox.1.sgml
+++ b/doc/openbox.1.sgml
@@ -81,7 +81,7 @@ manpage.1: manpage.sgml
     <para>You can use the <command>obconf</command> tool to configure Openbox
       easily with a graphical interface, however more in-depth configuration
       is possible by editing the configuration files by hand. The default
-      configuration file is installed in @confdir@/xdg/openbox/rc.xml, and the
+      configuration file is installed in @configdir@/openbox/rc.xml, and the
       user configuration is placed in ~/.config/openbox/rc.xml. You can copy
       the default configuration to ~/.config/openbox and edit it to your
       liking.</para>