diff --git a/packages/x11/xserver/xorg-server/install b/packages/x11/xserver/xorg-server/install
index 840e6bcbbd..ea5a797100 100755
--- a/packages/x11/xserver/xorg-server/install
+++ b/packages/x11/xserver/xorg-server/install
@@ -13,6 +13,8 @@ $SCRIPTS/install pixman
 $SCRIPTS/install dbus
 $SCRIPTS/install hal
 
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
 if [ "$XINERAMA" = "yes" ]; then
   $SCRIPTS/install libXinerama
 fi
@@ -22,8 +24,8 @@ XORG_DST="$INSTALL/$XORG_PATH_MODULES"
 
 mkdir -p $INSTALL/usr/bin
 cp $XORG_SRC/Xorg $INSTALL/usr/bin
-ln -sf /usr/bin/Xorg $INSTALL/usr/bin/X
 cp $XORG_SRC/utils/gtf/gtf $INSTALL/usr/bin
+cp -PR $PKG_DIR/scripts/xinit $INSTALL/usr/bin
 
 #opt:
 cp $XORG_SRC/utils/cvt/cvt $INSTALL/usr/bin
@@ -70,7 +72,6 @@ cp $PKG_BUILD/config/x11-input.fdi $INSTALL/usr/share/hal/fdi/policy/10osvendor/
   $SCRIPTS/install font-misc-misc
 
 #Server
-#  $SCRIPTS/install xorg-server
   $SCRIPTS/install xkeyboard-config
   $SCRIPTS/install xkbcomp
 
@@ -85,7 +86,5 @@ get_graphicdrivers
   done
 
 #Tools
-  $SCRIPTS/install xinit
   $SCRIPTS/install openbox
-
-  [ "$DEVTOOLS" = yes ] && $SCRIPTS/install roxterm
+  [ "$DEVTOOLS" = yes ] && $SCRIPTS/install mrxvt