diff --git a/.cvsignore b/.cvsignore
index add866a..ee92c94 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-filesystem-2.0.7.tar.gz
+filesystem-2.1.0.tar.gz
diff --git a/filesystem.spec b/filesystem.spec
index 50d673c..e883de8 100644
--- a/filesystem.spec
+++ b/filesystem.spec
@@ -1,13 +1,13 @@
 Summary: The basic directory layout for a Linux system.
 Name: filesystem
-Version: 2.0.7
-Release: 1.1
+Version: 2.1.0
+Release: 2
 Copyright: Public Domain
 Group: System Environment/Base
 Source0: %{name}-%{version}.tar.gz
 Buildroot: %{_tmppath}/%{name}-%{version}-root
 Prereq: setup
-BuildArchitectures: noarch
+#BuildArchitectures: noarch
 
 %description
 The filesystem package is one of the basic packages that is installed on
@@ -23,7 +23,7 @@ mkdir %{buildroot}
 
 cd %{buildroot}
 tar xzf %{SOURCE0}
-mkdir -m 755 %{buildroot}/initrd
+
 %clean
 rm -rf %{buildroot}
 
@@ -36,8 +36,10 @@ rm -rf %{buildroot}
 /initrd
 /lib
 %dir /mnt
+%ifnarch s390 s390x
 %attr(775,root,root) /mnt/floppy
 %attr(775,root,root) /mnt/cdrom
+%endif
 %dir /opt
 %attr(555,root,root) /proc
 %attr(750,root,root) /root
@@ -57,8 +59,8 @@ rm -rf %{buildroot}
 /var/db
 /var/lib
 /var/local
-%dir %attr(775,root,uucp) /var/lock
-%attr(775,root,root) /var/lock/subsys
+%dir %attr(755,root,root) /var/lock
+%attr(755,root,root) /var/lock/subsys
 /var/cache
 /var/log
 /var/mail
@@ -72,9 +74,23 @@ rm -rf %{buildroot}
 %attr(1777,root,root) /var/tmp
 
 %changelog
-* Tue Sep 18 2001 Bill Nottingham <notting@redhat.com>
+* Mon Jun 25 2001 Bill Nottingham <notting@redhat.com>
+- don't conflict with rpm
+
+* Fri Jun 22 2001 Bill Nottingham <notting@redhat.com>
+- don't own /var/lib/rpm (#43315)
+- add some stuff in /usr/local (#36522)
+
+* Thu Jun 21 2001 Bill Nottingham <notting@redhat.com>
 - add /initrd
- 
+
+* Thu Jun 07 2001 Florian La Roche <Florian.LaRoche@redhat.de>
+- remove noarch
+- do not include /mnt/cdrom and /mnt/floppy for s390/s390x
+
+* Mon Apr 16 2001 Bill Nottingham <notting@redhat.com>
+- take the group write off of /var/lock
+
 * Fri Jul 21 2000 Bill Nottingham <notting@redhat.com>
 - add /usr/share/empty
 
diff --git a/sources b/sources
index 1147cca..65ed289 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cbee4a6e5dbba6eff26c6290e6a4aa5f  filesystem-2.0.7.tar.gz
+7212ce1d33541b3e46a89d2d10f4069b  filesystem-2.1.0.tar.gz