diff --git a/glibc.changes b/glibc.changes
index 52f8d53..ddb6224 100644
--- a/glibc.changes
+++ b/glibc.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Wed Jul 17 09:47:02 UTC 2019 - Andreas Schwab <schwab@suse.de>
+
+- Move /var/lib/misc/Makefile to /usr/share/misc/Makefile.makedb (bsc#1138726)
+
 -------------------------------------------------------------------
 Wed Jun 26 07:41:20 UTC 2019 - Andreas Schwab <schwab@suse.de>
 
diff --git a/glibc.spec b/glibc.spec
index ad8805f..40e9ef5 100644
--- a/glibc.spec
+++ b/glibc.spec
@@ -980,6 +980,14 @@ rm -rf %{buildroot}%{_infodir} %{buildroot}%{_prefix}/share/i18n
 rm -f %{buildroot}%{_bindir}/makedb %{buildroot}/var/lib/misc/Makefile
 rm -f %{buildroot}%{_sbindir}/nscd
 %endif # i686
+
+%ifnarch i686
+# /var/lib/misc is incompatible with transactional updates (bsc#1138726)
+mkdir %{buildroot}%{_prefix}/share/misc
+mv %{buildroot}/var/lib/misc/Makefile %{buildroot}%{_prefix}/share/misc/Makefile.makedb
+ln -s %{_prefix}/share/misc/Makefile.makedb %{buildroot}/var/lib/misc/Makefile
+%endif
+
 %endif # !utils
 
 # LSB
@@ -1383,6 +1391,7 @@ exit 0
 %files extra
 %defattr(-,root,root)
 %{_bindir}/makedb
+%{_prefix}/share/misc/Makefile.makedb
 /var/lib/misc/Makefile
 %endif # !i686