diff --git a/xkb-tmpfiles.conf b/xkb-tmpfiles.conf
new file mode 100644
index 0000000..c58fbf9
--- /dev/null
+++ b/xkb-tmpfiles.conf
@@ -0,0 +1 @@
+C /var/lib/xkb/compiled/README.compiled 0644 - - - /usr/share/factory/var/lib/xkb/compiled/README.compiled
diff --git a/xorg-x11-server.changes b/xorg-x11-server.changes
index c093367..2d2b459 100644
--- a/xorg-x11-server.changes
+++ b/xorg-x11-server.changes
@@ -5,6 +5,14 @@ Thu Jul 19 14:12:01 CEST 2018 - tiwai@suse.de
   * Fix breakage of cirrus 24bpp support on modesetting driver
     (bsc#1101699)
 
+-------------------------------------------------------------------
+Tue Jul 10 12:03:43 UTC 2018 - fcrozat@suse.com
+
+- Remove /var/lib/X11 and its symlink, it is no longer needed and
+  doesn't work with transaction-updates (FATE#325524).
+- Move README.compiled to another location and use tmpfiles to
+  copy it at runtime.
+
 -------------------------------------------------------------------
 Mon Jul  2 12:46:54 UTC 2018 - sndirsch@suse.com
 
diff --git a/xorg-x11-server.spec b/xorg-x11-server.spec
index cc00fa9..d85cbf1 100644
--- a/xorg-x11-server.spec
+++ b/xorg-x11-server.spec
@@ -62,6 +62,7 @@ Source3:        xorgcfg.tar.bz2
 Source4:        xorg-backtrace
 Source5:        50-extensions.conf
 Source6:        modesetting.ids
+Source7:        xkb-tmpfiles.conf
 # RPM Macros to be installed. The ABI Versions will be injected by configure.
 Source90:       xorg-x11-server.macros.in
 # Source91 and Source99 are used to ensure proper ABI provides.
@@ -450,15 +451,18 @@ find %{buildroot}%{_libdir}/xorg/modules/ -name "*.la" | \
   xargs rm
 install -m 644 hw/xfree86/parser/{xf86Parser.h,xf86Optrec.h} \
   %{buildroot}%{_includedir}/xorg
+# FATE#325524
+mkdir -p %{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled
+mv %{buildroot}%{_localstatedir}/lib/xkb/compiled/README.compiled %{buildroot}%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled/
+mkdir -p %{buildroot}%{_tmpfilesdir}
+install -m 644 %{S:7} %{buildroot}%{_tmpfilesdir}/xkb.conf
 # bnc #632737
 chmod u-s %{buildroot}%{_bindir}/Xorg
-mkdir -p %{buildroot}%{_localstatedir}/lib/X11
 %if 0%{?pci_ids_dir:1}
 %__mkdir_p %{buildroot}%{pci_ids_dir}
 install -m 644 %{S:6} %{buildroot}%{pci_ids_dir}
 %endif
-ln -snf ../../../usr/bin/Xorg %{buildroot}%{_localstatedir}/lib/X11/X
-ln -snf ../../var/lib/X11/X %{buildroot}%{_bindir}/X
+ln -snf Xorg %{buildroot}%{_bindir}/X
 %if 0%{?suse_version} > 1120
 # get rid of evdev config file, since it's meanwhile shipped with
 # evdev driver itself (since 2.10.0)
@@ -502,6 +506,7 @@ mkdir -p %{buildroot}/usr/src/xserver
 xargs cp --parents --target-directory=%{buildroot}/usr/src/xserver < source-file-list
 
 %post
+%tmpfiles_create xbb.conf
 %ifnarch s390 s390x
 %{fillup_only -an displaymanager}
 # Move SaX2 generated xorg.conf file to xorg.conf.sle11
@@ -559,12 +564,12 @@ fi
 %dir %{pci_ids_dir}
 %{pci_ids_dir}/modesetting.ids
 %endif
+%{_tmpfilesdir}/xkb.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/10-quirks.conf
 %config(noreplace) %{_sysconfdir}/X11/xorg.conf.d/50-extensions.conf
 %dir %{_datadir}/X11/xorg.conf.d
 %{_datadir}/X11/xorg.conf.d/10-*.conf
 %endif
-%dir %{_localstatedir}/lib/X11
 %endif
 %dir %{_localstatedir}/lib/xkb
 %dir %{_localstatedir}/lib/xkb/compiled
@@ -574,7 +579,12 @@ fi
 %exclude %{_mandir}/man1/Xdmx.1*
 %exclude %{_mandir}/man1/Xephyr.1*
 %exclude %{_mandir}/man1/Xnest.1*
-%{_localstatedir}/lib/xkb/compiled/README.compiled
+%dir %{_datadir}/factory
+%dir %{_datadir}/factory/var
+%dir %{_datadir}/factory/var/lib
+%dir %{_datadir}/factory/var/lib/xkb
+%dir %{_datadir}/factory/var/lib/xkb/compiled
+%{_datadir}/factory/%{_localstatedir}/lib/xkb/compiled/README.compiled
 %ifnarch s390 s390x
 %{_bindir}/Xorg
 %if 0%{?build_suid_wrapper} == 1
@@ -588,7 +598,6 @@ fi
 %{_mandir}/man4/*
 %{_mandir}/man5/*
 %{_fillupdir}/sysconfig.displaymanager-%{name}
-%{_localstatedir}/lib/X11/X
 %if 0%{?suse_version} >= 1315
 %ghost %{_sysconfdir}/alternatives/libglx.so
 %endif