diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index 11abeaf..91cf875 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Wed Aug 13 08:13:21 UTC 2014 - sndirsch@suse.com
+
+- added /etc/alternatives/libglx.so as ghost
+- moved libglx-xorg.so to xorg/xorg-libglx.so to avoid messup in case
+  anybody runs ldconfig in modules/extensions
+
 -------------------------------------------------------------------
 Tue Aug 12 12:26:52 UTC 2014 - sndirsch@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index 08e63b0..85d7759 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -347,7 +347,9 @@ install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtr
 install -D xorg-x11-server.macros %{buildroot}%{_sysconfdir}/rpm/macros.xorg-server
 %ifnarch s390 s390x
 %if 0%{?suse_version} >= 1315
-mv  %{buildroot}%{_libdir}/xorg/modules/extensions/libglx{,-xorg}.so
+mkdir -p %{buildroot}%{_libdir}/xorg/modules/extensions/xorg
+mv  %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so \
+    %{buildroot}%{_libdir}/xorg/modules/extensions/xorg/xorg-libglx.so
 ln -snf %{_sysconfdir}/alternatives/libglx.so %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so
 %endif
 %endif
@@ -379,7 +381,7 @@ if [ -f etc/X11/xorg.conf -a ! -f etc/X11/xorg.conf.sle11 ]; then
 fi
 %if 0%{?suse_version} >= 1315
 %_sbindir/update-alternatives \
-    --force --install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so %{_libdir}/xorg/modules/extensions/libglx-xorg.so 50
+    --force --install %{_libdir}/xorg/modules/extensions/libglx.so libglx.so %{_libdir}/xorg/modules/extensions/xorg/xorg-libglx.so 50
 %endif
 %endif
 exit 0
@@ -388,7 +390,7 @@ exit 0
 %if 0%{?suse_version} >= 1315
 %postun
 if [ "$1" = 0 ] ; then
-   "%_sbindir/update-alternatives" --remove libglx.so %{_libdir}/xorg/modules/extensions/libglx-xorg.so
+   "%_sbindir/update-alternatives" --remove libglx.so %{_libdir}/xorg/modules/extensions/xorg/xorg-libglx.so
 fi
 %endif
 %endif
@@ -428,6 +430,7 @@ fi
 %{_mandir}/man5/*
 %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-%{name}
 %{_localstatedir}/lib/X11/X
+%ghost %{_sysconfdir}/alternatives/libglx.so
 %endif
 %{_bindir}/Xvfb
 %{_bindir}/xorg-backtrace