diff --git a/package/x11/xfree86/xf_config.sh b/package/x11/xfree86/xf_config.sh
index 9c8a469cf..270563d8f 100644
--- a/package/x11/xfree86/xf_config.sh
+++ b/package/x11/xfree86/xf_config.sh
@@ -80,15 +80,10 @@ xf_build() {
 	cd nls ; eval $MAKE ; cd ..
 }
 
-# install the World
-xf_install() {
-	echo "Create /etc/X11 (if it's not already there) ..."
+# prepare the XFree86 dirtree
+xf_dirtree() {
 	mkdir -p $root/etc/X11
-
-	eval $MAKE install
-	eval $MAKE install.man
-	cd nls ; eval $MAKE install ; cd ..
-	rm -fv $root/etc/fonts/*.bak
+	mkdir -p $root/usr/X11R6/lib/X11/fonts/TrueType
 
 	rm -fv $root/usr/X11
 	rm -fv $root/usr/bin/X11
@@ -99,9 +94,15 @@ xf_install() {
 	ln -sv ../X11/bin $root/usr/bin/X11
 	ln -sv ../X11/lib/X11 $root/usr/lib/X11
 	ln -sv ../X11/include/X11 $root/usr/include/X11
+}
+
+# install the World
+xf_install() {
+	eval $MAKE install
+	eval $MAKE install.man
+	cd nls ; eval $MAKE install ; cd ..
+	rm -fv $root/etc/fonts/*.bak
 
-	mkdir -p $root/usr/X11R6/lib/X11/fonts/TrueType
-	
 	echo "Copy TWM config files ..."
 	cp -v programs/twm/system.twmrc.orig \
 	  programs/twm/sample-twmrc/original.twmrc
diff --git a/package/x11/xfree86/xfree86.conf b/package/x11/xfree86/xfree86.conf
index dd5ad9fb1..ba9e2c4ee 100644
--- a/package/x11/xfree86/xfree86.conf
+++ b/package/x11/xfree86/xfree86.conf
@@ -24,6 +24,7 @@
 . package/x11/xfree86/xf_config.sh
 
 x11base_main() {
+	xf_dirtree
 	xf_extract
 
 	xf_extract_gl