diff --git a/init/genpkg b/init/genpkg
index 09b0b86..c5b96b5 100644
--- a/init/genpkg
+++ b/init/genpkg
@@ -37,7 +37,12 @@ if [ -d /var/install/sysvinit* ]; then
 		cd ..
 	done
 fi
-cd ../X11
-chmod 755 xdm/Xsession
-chmod 755 xinit/xinitrc
 cd $WDIR
+
+chmod 755 usr/X11R7/lib/X11/xdm/Xsession
+chmod 755 usr/X11R7/lib/X11/xinit/xinitrc
+
+if [ "$MK64BIT" == "true" ]; then
+	mkdir usr/X11R7/lib64
+	tar -C usr/X11R7/lib -cf - .|tar -C usr/X11R7/lib64 -xf -
+fi
diff --git a/etc/X11/XModules/filesafe b/usr/X11R7/lib/X11/XModules/filesafe
similarity index 100%
rename from etc/X11/XModules/filesafe
rename to usr/X11R7/lib/X11/XModules/filesafe
diff --git a/etc/X11/xdm/Xsession b/usr/X11R7/lib/X11/xdm/Xsession
similarity index 100%
rename from etc/X11/xdm/Xsession
rename to usr/X11R7/lib/X11/xdm/Xsession
diff --git a/etc/X11/xinit/xinitrc b/usr/X11R7/lib/X11/xinit/xinitrc
similarity index 100%
rename from etc/X11/xinit/xinitrc
rename to usr/X11R7/lib/X11/xinit/xinitrc