diff --git a/Makefile.in b/Makefile.in
index 1b18832..6b2ec3b 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -60,9 +60,9 @@ install: all
 	@echo installing xsession file to ${DESTDIR}${PREFIX}/share/xsessions
 	mkdir -p ${DESTDIR}${PREFIX}/share/xsessions
 	install -m 644 wmfs.desktop ${DESTDIR}${PREFIX}/share/xsessions/
-	@echo installing default config file to ${DESTDIR}${XDG_CONFIG_DIR}
-	mkdir -p ${DESTDIR}${XDG_CONFIG_DIR}
-	install -m 444 wmfsrc ${DESTDIR}${XDG_CONFIG_DIR}
+	@echo installing default config file to ${DESTDIR}${XDG_CONFIG_DIR}/wmfs/
+	mkdir -p ${DESTDIR}${XDG_CONFIG_DIR}/wmfs/
+	install -m 444 wmfsrc ${DESTDIR}${XDG_CONFIG_DIR}/wmfs/
 
 uninstall:
 	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
@@ -71,8 +71,9 @@ uninstall:
 	rm -f ${DESTDIR}${MANPREFIX}/man1/wmfs.1.gz
 	@echo removing xsession file from ${DESTDIR}${PREFIX}/share/xsessions
 	rm -f ${DESTDIR}${PREFIX}/share/xsessions/wmfs.desktop
-	@echo removing config file from ${DESTDIR}${XDG_CONFIG_DIR}
-	rm -f ${DESTDIR}${XDG_CONFIG_DIR}/wmfsrc
+	@echo removing config file from ${DESTDIR}${XDG_CONFIG_DIR}/wmfs/
+	rm -f ${DESTDIR}${XDG_CONFIG_DIR}/wmfs/wmfsrc
+	rmdir ${DESTDIR}${XDG_CONFIG_DIR}/wmfs/
 
 
 
diff --git a/configure b/configure
index a6184a9..27b83e0 100755
--- a/configure
+++ b/configure
@@ -7,7 +7,7 @@ USE_IMLIB2="imlib2"
 OS=`uname -s`
 PREFIX=/usr/local
 MANPREFIX="$PREFIX/man"
-XDG_CONFIG_DIR="$PREFIX/etc/xdg/wmfs"
+XDG_CONFIG_DIR="$PREFIX/etc/xdg"
 
 while true; do
 	case "$1" in