diff --git a/xorg/xorg-server/parse-config b/xorg/xorg-server/parse-config
index 5eaf896b6..f90ba1096 100644
--- a/xorg/xorg-server/parse-config
+++ b/xorg/xorg-server/parse-config
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../xorg-server/parse-config
-# Copyright (C) 2009 The OpenSDE Project
+# Copyright (C) 2009 - 2010 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -19,3 +19,7 @@ if hasflag X11R6; then
 	var_append GCC_WRAPPER_INSERT ' ' '*/X11R6/lib?-L/usr/X11/lib'
 	var_append GCC_WRAPPER_INSERT ' ' '*/X11R6/lib64?-L/usr/X11/lib64'
 fi
+
+if atstage cross && pkginstalled libx11; then
+	var_append GCC_WRAPPER_INSERT ' ' "-Wl,-rpath,$(pkgprefix -r libdir libx11)"
+fi