diff --git a/xorg/xorg-server/modular-x-conf.in b/xorg/xorg-server/modular-x-conf.in
index 263bddb21..8e2374cb8 100644
--- a/xorg/xorg-server/modular-x-conf.in
+++ b/xorg/xorg-server/modular-x-conf.in
@@ -2,7 +2,7 @@
 # This copyright note is auto-generated by ./scripts/Create-CopyPatch.
 #
 # Filename: package/.../xorg-server/modular-x-conf.in
-# Copyright (C) 2007 - 2008 The OpenSDE Project
+# Copyright (C) 2007 - 2012 The OpenSDE Project
 # Copyright (C) 2004 - 2006 The T2 SDE Project
 #
 # More information can be found in the files COPYING and README.
@@ -16,6 +16,12 @@
 if [ $prefix_auto = 1 ] ; then
 	prefix="usr/X11R7"
 	set_confopt
+
+	if atstage toolchain; then
+		if [ ! -d "$root$bindir/" ]; then
+			ln -sv "../bin" "$root$bindir"
+		fi
+	fi
 fi
 
 # apply external patches that Are defined in the .desc file