diff --git a/.cvsignore b/.cvsignore
index f731e18..2e1cabc 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
-gphoto2-2.1.0.tar.gz
+gphoto2-2.1.2.tar.bz2
+libgphoto2-2.1.2.tar.bz2
diff --git a/gphoto2.spec b/gphoto2.spec
index 3b5604b..9aa32c3 100644
--- a/gphoto2.spec
+++ b/gphoto2.spec
@@ -1,15 +1,16 @@
 Summary: Software for accessing digital cameras
 Name: gphoto2
 %define pkg gphoto2
-%define pkgver 2.1.0
+%define pkgver 2.1.2
+%define libpkg libgphoto2
+%define libver 2.1.2
 Version: %{pkgver}
-Release: 7
+Release: 1
 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.1.0-no-rpath.patch
+Source0: http://prdownloads.sourceforge.net/gphoto/%{pkg}-%{pkgver}.tar.bz2
+Source1: http://prdownloads.sourceforge.net/gphoto/%{libpkg}-%{libver}.tar.bz2
 Url: http://www.gphoto.org/
 ExcludeArch: s390 s390x
 # For /etc/hotplug/usb..
@@ -62,43 +63,69 @@ use libgphoto2.
 
 ####################################
 %prep
-rm -rf "${RPM_BUILD_DIR}/%{name}-%{version}"
-%setup -q -n %{pkg}-%{pkgver}
-%patch0 -p1 -b .no-rpath
+%setup -q -a 1
 
 ####################################
 %build
-%define __libtoolize :
+pushd %{libpkg}-%{libver}
+%configure --disable-rpath --enable-docs \
+	--with-doc-dir=%{buildroot}%{_docdir}/%{name}
+export tagname=CC
+make LIBTOOL=/usr/bin/libtool
+ln -s . libgphoto2/gphoto2
+ln -s . libgphoto2_port/libgphoto2_port/gphoto2
+popd
+
+gp_path=../libgphoto2_port/libgphoto2_port
+cat $(pwd)/libgphoto2-%{libver}/libgphoto2/libgphoto2.pc | sed \
+  -e "s,^libdir=.*$,libdir=$(pwd)/libgphoto2-%{libver}/libgphoto2," \
+  -e "s,^includedir=.*$,includedir=$(pwd)/libgphoto2-%{libver}/libgphoto2," \
+  -e "s,^Libs:.*},Libs: -L\${libdir}/.libs -L\${libdir}/$gp_path/.libs/," \
+  -e "s,^Cflags:.*$,Cflags: -I\${includedir}/$gp_path -I\${includedir}," \
+  > libgphoto2.pc
+export PKG_CONFIG_PATH=.
 %configure --enable-docs --with-doc-dir=%{buildroot}%{_docdir}/%{name}
-make
+export tagname=CC
+make LIBTOOL=/usr/bin/libtool
 
 ####################################
 %install
 rm -rf "${RPM_BUILD_ROOT}"
 
+pushd %{libpkg}-%{libver}
+
 # Convince gphoto2 to be packaged.
 perl -p -i -e "s|^libdir.*|libdir='$RPM_BUILD_ROOT%{_libdir}'|g" \
 	libgphoto2_port/libgphoto2_port/libgphoto2_port.la
 
-%makeinstall
+export tagname=CC
+%makeinstall LIBTOOL=/usr/bin/libtool
+
+install -d -m755 %{buildroot}/etc/hotplug/usb/
+install -m755 packaging/linux-hotplug/usbcam.console %{buildroot}/etc/hotplug/usb/usbcam
+
+popd
+
+export tagname=CC
+%makeinstall LIBTOOL=/usr/bin/libtool
 
 # Fix up libtool libraries.
 find $RPM_BUILD_ROOT -name '*.la' | \
   xargs perl -p -i -e "s|$RPM_BUILD_ROOT||g"
 
-install -d -m755 %{buildroot}/etc/hotplug/usb/
-install -m755 packaging/linux-hotplug/usbcam.console %{buildroot}/etc/hotplug/usb/usbcam
-
 cp -a %{buildroot}%{_docdir}/%{name} installed-doc
-find installed-doc -name '*.sgml' | xargs rm
+find installed-doc -name '*.sgml' | xargs -r rm
 rm -rf %{buildroot}%{_docdir}/%{name}
 rm -rf %{buildroot}%{_libdir}/gphoto2/*/*a
 rm -rf %{buildroot}%{_libdir}/gphoto2_port/*/*a
 rm -rf %{buildroot}%{_libdir}/*.a
 
+eval `grep ^LIBGPHOTO2_CURRENT %{libpkg}-%{libver}/configure.in`
+eval `grep ^LIBGPHOTO2_PORT_CURRENT %{libpkg}-%{libver}/libgphoto2_port/configure.in`
 %find_lang %{name}
-%find_lang libgphoto2_port
-cat libgphoto2_port.lang >> %{name}.lang
+%find_lang %{libpkg}-$LIBGPHOTO2_CURRENT
+%find_lang %{libpkg}_port-$LIBGPHOTO2_PORT_CURRENT
+cat libgphoto2*.lang >> %{name}.lang
 
 
 ####################################
@@ -112,11 +139,10 @@ rm -rf "${RPM_BUILD_ROOT}"
 ####################################
 %files -f %{name}.lang
 %defattr(-,root,root)
-%doc doc/gphoto2.txt doc/gphoto2-cli.txt
 %doc AUTHORS README COPYING
 %{_bindir}/gphoto2
 /etc/hotplug/usb/usbcam
-%{_datadir}/gphoto2
+%{_datadir}/libgphoto2
 %dir %{_libdir}/gphoto2_port
 %dir %{_libdir}/gphoto2_port/*
 %{_libdir}/gphoto2_port/*/*.so
@@ -124,6 +150,7 @@ rm -rf "${RPM_BUILD_ROOT}"
 %dir %{_libdir}/gphoto2/*
 %{_libdir}/gphoto2/*/*.so
 %{_libdir}/*.so.*
+%{_libdir}/libgphoto2
 %{_mandir}/man1/gphoto2.1*
 
 
@@ -131,7 +158,7 @@ rm -rf "${RPM_BUILD_ROOT}"
 %post
 # add supported cameras to /etc/hotplug/usb.usermap
 grep -v '^usbcam' /etc/hotplug/usb.usermap > /etc/hotplug/usb.usermap.tmp
-/usr/bin/gphoto2 --print-usb-usermap >> /etc/hotplug/usb.usermap.tmp
+%{_libdir}/libgphoto2/print-usb-usermap >> /etc/hotplug/usb.usermap.tmp
 mv /etc/hotplug/usb.usermap.tmp /etc/hotplug/usb.usermap
 # register libraries
 /sbin/ldconfig
@@ -153,7 +180,7 @@ fi
 ####################################
 %files devel
 %defattr(-,root,root)
-%doc installed-doc/html
+%doc installed-doc
 %{_bindir}/gphoto2-config
 %{_bindir}/gphoto2-port-config
 %{_includedir}/gphoto2
@@ -166,6 +193,22 @@ fi
 # ChangeLog
 ########################################################################
 %changelog
+* Tue Sep 16 2003 Tim Waugh <twaugh@redhat.com> 2.1.2-1
+- 2.1.2.
+
+* Wed Aug  6 2003 Elliot Lee <sopwith@redhat.com> 2.1.1-4
+- Fix libtool
+
+* Wed Jun 04 2003 Elliot Lee <sopwith@redhat.com>
+- rebuilt
+
+* Thu Mar 20 2003 Tim Waugh <twaugh@redhat.com> 2.1.1-2
+- Ship print-usb-usermap, fix post scriptlet.
+
+* Thu Mar 20 2003 Tim Waugh <twaugh@redhat.com> 2.1.1-1
+- Use installed libtool.
+- 2.1.1.
+
 * Sat Feb 01 2003 Florian La Roche <Florian.LaRoche@redhat.de>
 - only package man3 in devel rpm
 
diff --git a/sources b/sources
index 6f56bdf..2d2da6f 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
-7ea810311ddb2a8f5dfac0e2a720f155  gphoto2-2.1.0.tar.gz
+322999934ac09df43747dadafacb7a5e  gphoto2-2.1.2.tar.bz2
+ded0d8262d02e4c215ffc0d73d5acbbb  libgphoto2-2.1.2.tar.bz2