diff --git a/.cvsignore b/.cvsignore
index d199b95..f731e18 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-gphoto2-2.0.tar.gz
+gphoto2-2.1.0.tar.gz
diff --git a/gphoto2.spec b/gphoto2.spec
index b5b7397..c2b4bf4 100644
--- a/gphoto2.spec
+++ b/gphoto2.spec
@@ -1,25 +1,27 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
 %define pkg gphoto2
-%define pkgver 2.0
-Version: 2.0
-Release: 4
+%define pkgver 2.1.0
+Version: %{pkgver}
+Release: 3
 License: LGPL
 Group: Applications/Multimedia
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 #Source: http://www.gphoto.org/dist/%{pkg}-%{pkgver}.tar.gz
 Source: ftp://ufies.org/pub/people/christophe/gphoto2/%{pkg}-%{pkgver}.tar.gz
-Patch0: gphoto2-2.0-cvsfixes.patch
-Patch1: gphoto2-consolelock.patch
+Patch0: gphoto2-2.1.0-no-rpath.patch
 Url: http://www.gphoto.org/
+ExcludeArch: s390 s390x
 # For /etc/hotplug/usb..
 PreReq: hotplug >= 2001_04_24-13
 PreReq: /sbin/ldconfig, grep, fileutils
 Provides: libgphoto2
+Requires: lockdev
 BuildRequires: libusb-devel >= 0.1.5
 BuildRequires: gtk-doc
 BuildRequires: findutils perl
 BuildRequires: transfig
+BuildRequires: lockdev-devel
 
 ####################################
 %description
@@ -62,8 +64,7 @@ use libgphoto2.
 %prep
 rm -rf "${RPM_BUILD_DIR}/%{name}-%{version}"
 %setup -q -n %{pkg}-%{pkgver}
-%patch0 -p1 -b .cvsfixes
-%patch1 -p1 -b .consolelock
+%patch0 -p1 -b .no-rpath
 
 ####################################
 %build
@@ -85,8 +86,10 @@ perl -p -i -e "s|^libdir.*|libdir='$RPM_BUILD_ROOT%{_libdir}'|g" \
 find $RPM_BUILD_ROOT -name '*.la' | \
   xargs perl -p -i -e "s|$RPM_BUILD_ROOT||g"
 
+%ifnarch s390 s390x
 install -d -m755 %{buildroot}/etc/hotplug/usb/
-install -m755 packaging/usbcam.console %{buildroot}/etc/hotplug/usb/usbcam
+install -m755 packaging/linux-hotplug/usbcam.console %{buildroot}/etc/hotplug/usb/usbcam
+%endif
 
 cp -a %{buildroot}%{_docdir}/%{name} installed-doc
 find installed-doc -name '*.sgml' | xargs rm
@@ -108,17 +111,22 @@ rm -rf "${RPM_BUILD_ROOT}"
 %doc doc/gphoto2.txt doc/gphoto2-cli.txt
 %doc AUTHORS README COPYING
 %{_bindir}/gphoto2
+%ifnarch s390 s390x
 /etc/hotplug/usb/usbcam
+%endif
 %{_datadir}/gphoto2
 %dir %{_libdir}/gphoto2_port
 %dir %{_libdir}/gphoto2_port/*
 %{_libdir}/gphoto2_port/*/*.so
+%dir %{_libdir}/gphoto2
+%dir %{_libdir}/gphoto2/*
 %{_libdir}/gphoto2/*/*.so
 %{_libdir}/*.so.*
 %{_mandir}/man1/gphoto2.1*
 
 
 ####################################
+%ifnarch s390 s390x
 %post
 # add supported cameras to /etc/hotplug/usb.usermap
 grep -v '^usbcam' /etc/hotplug/usb.usermap > /etc/hotplug/usb.usermap.tmp
@@ -136,6 +144,7 @@ if [ "$1" = 0 ]; then
     grep -v '^usbcam' /etc/hotplug/usb.usermap > /etc/hotplug/usb.usermap.new
     mv /etc/hotplug/usb.usermap.new /etc/hotplug/usb.usermap
 fi
+%endif
 
 ########################################################################
 # file list and installation for -devel subpackage
@@ -156,6 +165,31 @@ fi
 # ChangeLog
 ########################################################################
 %changelog
+* Thu Jul 18 2002 Tim Waugh <twaugh@redhat.com> 2.1.0-3
+- Own some more directories.
+
+* Fri Jun 28 2002 Tim Waugh <twaugh@redhat.com> 2.1.0-2
+- Don't use -rpath (bug #65983).
+
+* Tue Jun 25 2002 Tim Waugh <twaugh@redhat.com> 2.1.0-1
+- 2.1.0.
+- No longer need cvsfixes or consolelock patches.
+
+* Fri Jun 21 2002 Tim Powers <timp@redhat.com> 2.0-9
+- automated rebuild
+
+* Thu May 23 2002 Tim Powers <timp@redhat.com> 2.0-8
+- automated rebuild
+
+* Thu May  9 2002 Tim Waugh <twaugh@redhat.com> 2.0-7
+- Require lockdev (bug #64193).
+
+* Mon Apr 29 2002 Tim Waugh <twaugh@redhat.com> 2.0-6
+- In fact, don't even build for mainframe.
+
+* Mon Apr 29 2002 Florian La Roche <Florian.LaRoche@redhat.de> 2.0-5
+- do not require hotplug for mainframe
+
 * Mon Apr 15 2002 Nalin Dahyabhai <nalin@redhat.com> 2.0-4
 - Set the owner of the device to the console lock holder, not the owner
   of /dev/console, in the hotplug agent, fixing access for users who log
diff --git a/sources b/sources
index 39a4514..6f56bdf 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f958d3c4b7238a8d6f1827da0d708941  gphoto2-2.0.tar.gz
+7ea810311ddb2a8f5dfac0e2a720f155  gphoto2-2.1.0.tar.gz