diff --git a/filesystem.changes b/filesystem.changes
index f3db083..9d2174e 100644
--- a/filesystem.changes
+++ b/filesystem.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Aug 23 11:49:33 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
+
+- use %ghost for /bin, /sbin, /lib and /lib64 to avoid file conflict
+  with pre-usrmerge filesystem package (boo#1188847).
+
 -------------------------------------------------------------------
 Mon Aug  2 07:55:40 UTC 2021 - Ludwig Nussel <lnussel@suse.de>
 
diff --git a/filesystem.links b/filesystem.links
index 4cf1248..fc09b0d 100644
--- a/filesystem.links
+++ b/filesystem.links
@@ -2,4 +2,4 @@
 # Required for FHS 2.1
 spool/mail		/var/mail
 # systemd
-../run                  /var/run
+../run                  /var/run  %ghost
diff --git a/filesystem.spec b/filesystem.spec
index 05d83c9..27d15b1 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -161,11 +161,11 @@ echo "%%defattr(-,root,root)" > filesystem.list
 cat %{SOURCE64} >> directory.list
 %endif
 cat >> filesystem.links << EOF
-usr/bin   /bin
-usr/sbin  /sbin
-usr/lib   /lib
+usr/bin   /bin %%ghost
+usr/sbin  /sbin %%ghost
+usr/lib   /lib %%ghost
 %ifarch s390x %sparc x86_64 ppc64 ppc aarch64 ppc64le riscv64
-usr/lib64 /lib64
+usr/lib64 /lib64 %%ghost
 %endif
 EOF
 cat >> directory.list <<EOF
@@ -176,9 +176,9 @@ while read MOD OWN GRP NAME ; do
     create_dir $MOD $OWN $GRP $NAME
 done < directory.list
 # ghost files next
-cat ghost.list | while read MOD OWN GRP NAME ; do
+while read MOD OWN GRP NAME ; do
     create_dir $MOD $OWN $GRP $NAME "%%ghost "
-done
+done < ghost.list
 # arch specific leftovers
 for march in \
 %ifarch %ix86
@@ -216,7 +216,7 @@ done
 create_dir 0755 root root /emul/ia32-linux
 %endif
 # now do the links
-while read SRC DEST ; do
+while read SRC DEST ATTR ; do
 case $SRC in
  "") continue ;;
  \#*) echo "comment: $SRC $DEST" ;;
@@ -229,8 +229,7 @@ case $SRC in
     esac
     ln -sf $SRC $RPM_BUILD_ROOT$DEST
     case $DEST in
-	/var/run|/var/lock) echo "%ghost $DEST" >> filesystem.list ;;
-	*) echo "$DEST" >> filesystem.list ;;
+	*) echo "$ATTR${ATTR:+ }$DEST" >> filesystem.list ;;
     esac
     # for tmpfiles.d
     case  $DEST in