diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index a28ba64..46974d5 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Aug 12 12:26:52 UTC 2014 - sndirsch@suse.com
+
+- make use of update-alternatives for libglx.so (FATE#317822) 
+
 -------------------------------------------------------------------
 Thu Aug  7 17:35:12 UTC 2014 - eich@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index ec3efd4..08e63b0 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -118,6 +118,10 @@ Requires:       libpixman-1-0 >= 0.24
 %(cat %{SOURCE91})
 %endif
 Requires:       Mesa
+%if 0%{?suse_version} >= 1315
+Requires(post):   update-alternatives
+Requires(postun): update-alternatives
+%endif
 Provides:       xorg-x11-Xvfb
 Provides:       xorg-x11-server-glx
 Obsoletes:      xorg-x11-Xvfb
@@ -341,6 +345,12 @@ install -m 644 %_sourcedir/sysconfig.displaymanager.template \
 %endif
 install -m 755 $RPM_SOURCE_DIR/xorg-backtrace %{buildroot}%{_bindir}/xorg-backtrace
 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
+ln -snf %{_sysconfdir}/alternatives/libglx.so %{buildroot}%{_libdir}/xorg/modules/extensions/libglx.so
+%endif
+%endif
 
 %post
 %ifnarch s390 s390x
@@ -367,9 +377,22 @@ if [ -f etc/X11/xorg.conf -a ! -f etc/X11/xorg.conf.sle11 ]; then
     chmod -x usr/sbin/sax2
   fi
 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
+%endif
 %endif
 exit 0
 
+%ifnarch s390 s390x
+%if 0%{?suse_version} >= 1315
+%postun
+if [ "$1" = 0 ] ; then
+   "%_sbindir/update-alternatives" --remove libglx.so %{_libdir}/xorg/modules/extensions/libglx-xorg.so
+fi
+%endif
+%endif
+
 %files
 %defattr(-,root,root)
 %ifnarch s390 s390x