diff --git a/directory.list b/directory.list
index 67c4421..e2e85bc 100644
--- a/directory.list
+++ b/directory.list
@@ -42,6 +42,7 @@
 0700 root root /etc/sysconfig/network/providers
 0755 root root /etc/sysconfig/network/scripts
 0755 root root /etc/sysconfig/scripts
+0755 root root /etc/tmpdirs.d
 0750 news news /etc/news
 0755 root root /etc/opt
 0750 root dialout /etc/ppp
@@ -58,8 +59,6 @@
 0755 root root /lib/modules
 0755 root root /lib/firmware
 0755 root root /media
-0755 root root /media/cdrom
-0755 root root /media/floppy
 0755 root root /mnt
 0755 root root /opt
 0555 root root /proc
@@ -75,8 +74,6 @@
 0755 root root /srv/www/htdocs
 0755 root root /sys
 1777 root root /tmp
-1777 root root /tmp/.X11-unix
-1777 root root /tmp/.ICE-unix
 0755 root root /usr
 0755 root root /usr/X11R6
 0755 root root /usr/X11R6/bin
@@ -186,7 +183,6 @@
 0755 uucp uucp /var/spool/uucp
 0755 root root /var/spool/uucp/uucp
 1777 root root /var/tmp
-1777 root root /var/tmp/vi.recover
 0755 root root /var/log
 0755 root root /var/opt
 0700 root root /var/adm/update-scripts
diff --git a/filesystem.changes b/filesystem.changes
index 0bc81a5..8a11cc8 100644
--- a/filesystem.changes
+++ b/filesystem.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Wed Apr 28 17:04:20 CEST 2010 - ro@suse.de
+
+- add ghost.list with directories only listed in this package
+  as ghost files, move /tmp/.X11-unix, /tmp/.ICE-unix
+  and /var/tmp/vi.recover to that list
+- also move /media/cdrom and /media/floppy to that list
+  they were done manually as ghosts in the specfile before 
+
 -------------------------------------------------------------------
 Tue Apr 27 10:20:52 UTC 2010 - aj@suse.de
 
diff --git a/filesystem.spec b/filesystem.spec
index a1b80a0..662dc95 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -31,6 +31,7 @@ Provides:       aaa_dir
 Source:         directory.list
 Source1:        filesystem.links
 Source2:        languages
+Source3:        ghost.list
 Source64:       directory.list64
 
 %prep
@@ -51,26 +52,26 @@ function create_dir () {
 }
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT
+# generic directories first
 echo "%%defattr(-,root,root)" > filesystem.list
 {
     cat %{SOURCE0}
 %ifarch s390x %sparc x86_64 ppc64 ppc
     cat %{SOURCE64}
 %endif
-} |
-while read MOD OWN GRP NAME ; do
-%ifarch s390 s390x
-    case $NAME in
-	/media/floppy|/media/cdrom|/floppy|/cdrom) continue ;;
-    esac
-%endif
-    case $NAME in
-	/media/floppy|/media/cdrom)
-	    create_dir $MOD $OWN $GRP $NAME "%%verify(not mode) %%ghost "
-	    continue ;;
-    esac
+} | while read MOD OWN GRP NAME ; do
     create_dir $MOD $OWN $GRP $NAME
 done
+# ghost files next
+cat %{SOURCE3} | while read MOD OWN GRP NAME ; do
+%ifarch s390 s390x
+    case $NAME in
+	/media/floppy|/media/cdrom) continue ;;
+    esac
+%endif
+    create_dir $MOD $OWN $GRP $NAME "%%verify(not mode) %%ghost "
+done
+# arch specific leftovers
 for march in \
 %ifarch %ix86
 i586-suse-linux \
diff --git a/ghost.list b/ghost.list
new file mode 100644
index 0000000..f858bfd
--- /dev/null
+++ b/ghost.list
@@ -0,0 +1,5 @@
+0755 root root /media/cdrom
+0755 root root /media/floppy
+1777 root root /tmp/.X11-unix
+1777 root root /tmp/.ICE-unix
+1777 root root /var/tmp/vi.recover