diff --git a/xorg/X11R7.6/buildx.sh b/xorg/X11R7.6/buildx.sh
index 40a44f64..c2710a78 100755
--- a/xorg/X11R7.6/buildx.sh
+++ b/xorg/X11R7.6/buildx.sh
@@ -46,7 +46,8 @@ download_file()
         cd ..
         return $status
     elif [ "$file" = "expat-2.0.1.tar.gz" ]; then
-        wget -cq http://surfnet.dl.sourceforge.net/project/expat/expat/2.0.1/expat-2.0.1.tar.gz
+        wget -cq http://server1.xrdp.org/xrdp/expat-2.0.1.tar.gz
+
         status=$?
         cd ..
         return $status
@@ -280,9 +281,7 @@ echo "using $PREFIX_DIR"
 
 export PKG_CONFIG_PATH=$PREFIX_DIR/lib/pkgconfig:$PREFIX_DIR/share/pkgconfig
 
-# using this seems to cause more trouble than good
-#export PATH=$PREFIX_DIR/bin:$PATH
-#export LD_LIBRARY_PATH=$PREFIX_DIR/lib
+export PATH=$PREFIX_DIR/bin:$PATH
 
 # really only needed for x84
 export CFLAGS=-fPIC
diff --git a/xorg/X11R7.6/x11_file_list.txt b/xorg/X11R7.6/x11_file_list.txt
index 4385cce9..add66646 100644
--- a/xorg/X11R7.6/x11_file_list.txt
+++ b/xorg/X11R7.6/x11_file_list.txt
@@ -56,6 +56,7 @@ xextproto-7.1.2.tar.bz2                         :  xextproto-7.1.2
 xproto-7.0.20.tar.bz2                           :  xproto-7.0.20                            :
 xcb-proto-1.6.tar.bz2                           :  xcb-proto-1.6                            :
 libxcb-1.7.tar.bz2                              :  libxcb-1.7                               :
+xtrans-1.2.6.tar.bz2                            :  xtrans-1.2.6                             :
 libX11-1.4.0.tar.bz2                            :  libX11-1.4.0                             :
 libXext-1.2.0.tar.bz2                           :  libXext-1.2.0                            :
 libICE-1.0.7.tar.bz2                            :  libICE-1.0.7                             :
@@ -66,7 +67,6 @@ randrproto-1.3.2.tar.bz2                        :  randrproto-1.3.2
 renderproto-0.11.1.tar.bz2                      :  renderproto-0.11.1                       :
 fixesproto-4.1.2.tar.bz2                        :  fixesproto-4.1.2                         :
 xcmiscproto-1.2.1.tar.bz2                       :  xcmiscproto-1.2.1                        :
-xtrans-1.2.6.tar.bz2                            :  xtrans-1.2.6                             :
 xf86vidmodeproto-2.3.tar.bz2                    :  xf86vidmodeproto-2.3                     :
 xf86bigfontproto-1.2.0.tar.bz2                  :  xf86bigfontproto-1.2.0                   :
 scrnsaverproto-1.2.1.tar.bz2                    :  scrnsaverproto-1.2.1                     :