diff --git a/U_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch b/u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch
similarity index 100%
rename from U_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch
rename to u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch
diff --git a/U_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch b/u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch
similarity index 100%
rename from U_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch
rename to u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index e8fb5df..58bfdb3 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -1,3 +1,30 @@
+-------------------------------------------------------------------
+Wed Aug 13 12:39:39 UTC 2014 - sndirsch@suse.com
+
+- only add /etc/alternatives/libglx.so as ghost on suse >= 1315
+
+-------------------------------------------------------------------
+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
+
+- make use of update-alternatives for libglx.so (FATE#317822) 
+
+-------------------------------------------------------------------
+Thu Aug  7 17:35:12 UTC 2014 - eich@suse.com
+
+- Change U_ to u_ as these patches are not upstream yet:
+  * U_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch
+    --> u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch
+  * U_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch
+    --> u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch
+  (bnc#890599).
+
 -------------------------------------------------------------------
 Thu Aug  7 14:50:55 CEST 2014 - tiwai@suse.de
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index fa8c529..dfb644a 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
@@ -152,8 +156,8 @@ Patch110:       u_connection-avoid-crash-when-CloseWellKnownConnections-gets-cal
 Patch111:       u_CloseConsole-Don-t-report-FatalError-when-shutting-down.patch
 Patch112:       u_render-Cast-color-masks-to-unsigned-long-before-shifting-them.patch
 Patch130:       U_BellProc-Send-bell-event-on-core-protocol-bell-when-requested.patch
-Patch131:       U_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch
-Patch132:       U_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch
+Patch131:       u_render-Don-t-generate-invalid-pixman-format-when-using-a-24bpp-framebuffer-with-a-32bit-depth-visual.patch
+Patch132:       u_fb-Correctly-implement-CopyArea-when-using-a-window-with-depth-32-and-24bpp.patch
 
 Patch1000:      n_xserver-optimus-autoconfig-hack.patch
 
@@ -341,6 +345,14 @@ 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
+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
 
 %post
 %ifnarch s390 s390x
@@ -367,9 +379,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/xorg/xorg-libglx.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/xorg/xorg-libglx.so
+fi
+%endif
+%endif
+
 %files
 %defattr(-,root,root)
 %ifnarch s390 s390x
@@ -405,6 +430,9 @@ exit 0
 %{_mandir}/man5/*
 %{_localstatedir}/adm/fillup-templates/sysconfig.displaymanager-%{name}
 %{_localstatedir}/lib/X11/X
+%if 0%{?suse_version} >= 1315
+%ghost %{_sysconfdir}/alternatives/libglx.so
+%endif
 %endif
 %{_bindir}/Xvfb
 %{_bindir}/xorg-backtrace