diff --git a/.cvsignore b/.cvsignore
index e6fe8d1..8ab9082 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -218,3 +218,4 @@ pycups-1.9.49.tar.bz2
 system-config-printer-1.2.0.tar.xz
 system-config-printer-1.2.1.tar.xz
 system-config-printer-1.2.2.tar.xz
+pysmbc-1.0.7.tar.bz2
diff --git a/pysmbc-1.0.6.tar.bz2.sig b/pysmbc-1.0.6.tar.bz2.sig
deleted file mode 100644
index e88c1ec..0000000
Binary files a/pysmbc-1.0.6.tar.bz2.sig and /dev/null differ
diff --git a/pysmbc-1.0.7.tar.bz2.sig b/pysmbc-1.0.7.tar.bz2.sig
new file mode 100644
index 0000000..c76411b
--- /dev/null
+++ b/pysmbc-1.0.7.tar.bz2.sig
@@ -0,0 +1,7 @@
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.14 (GNU/Linux)
+
+iD8DBQBL8nU8BLQafZpK2tcRAoYjAKCWjLs2dyh1TSsj+UQ7sPmf/Frk/ACgkwNw
+O8USf8fZmPPt14wAZPt5Phk=
+=TdIr
+-----END PGP SIGNATURE-----
diff --git a/sources b/sources
index 2ed88c8..7428660 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,4 @@
 ac8f98a40b0fc4b6ab4470f10489887a  pysmbc-1.0.6.tar.bz2
 6db9d8bc7f40315bc0b93f210737cc82  pycups-1.9.49.tar.bz2
 b14021236af2d935641c27d214d4923a  system-config-printer-1.2.2.tar.xz
+89e6fd9129f1700eec16156bdbf60dda  pysmbc-1.0.7.tar.bz2
diff --git a/system-config-printer-no-epydoc.patch b/system-config-printer-no-epydoc.patch
index dd79aca..c826fab 100644
--- a/system-config-printer-no-epydoc.patch
+++ b/system-config-printer-no-epydoc.patch
@@ -1,7 +1,7 @@
-diff -up system-config-printer-1.2.0/Makefile.am.no-epydoc system-config-printer-1.2.0/Makefile.am
---- system-config-printer-1.2.0/Makefile.am.no-epydoc	2010-03-16 18:22:08.000000000 +0000
-+++ system-config-printer-1.2.0/Makefile.am	2010-03-17 14:37:37.977366218 +0000
-@@ -247,7 +247,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
+diff -up system-config-printer-1.2.2/Makefile.am.no-epydoc system-config-printer-1.2.2/Makefile.am
+--- system-config-printer-1.2.2/Makefile.am.no-epydoc	2010-05-07 15:19:03.000000000 +0100
++++ system-config-printer-1.2.2/Makefile.am	2010-05-18 12:57:39.219065881 +0100
+@@ -248,7 +248,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
  
  html:	$(EXPORT_MODULES)
  	rm -rf html
@@ -12,10 +12,10 @@ diff -up system-config-printer-1.2.0/Makefile.am.no-epydoc system-config-printer
  
  distcheck-hook: update-po missing-imports
  
-diff -up system-config-printer-1.2.0/Makefile.in.no-epydoc system-config-printer-1.2.0/Makefile.in
---- system-config-printer-1.2.0/Makefile.in.no-epydoc	2010-03-17 14:29:52.000000000 +0000
-+++ system-config-printer-1.2.0/Makefile.in	2010-03-17 14:37:19.098486129 +0000
-@@ -1430,7 +1430,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
+diff -up system-config-printer-1.2.2/Makefile.in.no-epydoc system-config-printer-1.2.2/Makefile.in
+--- system-config-printer-1.2.2/Makefile.in.no-epydoc	2010-05-07 15:26:09.000000000 +0100
++++ system-config-printer-1.2.2/Makefile.in	2010-05-18 12:57:39.222067064 +0100
+@@ -1431,7 +1431,9 @@ $(man_MANS): $(top_srcdir)/man/system-co
  
  html:	$(EXPORT_MODULES)
  	rm -rf html
@@ -26,9 +26,9 @@ diff -up system-config-printer-1.2.0/Makefile.in.no-epydoc system-config-printer
  
  distcheck-hook: update-po missing-imports
  
-diff -up system-config-printer-1.2.0/pycups-1.9.49/Makefile.no-epydoc system-config-printer-1.2.0/pycups-1.9.48/Makefile
---- system-config-printer-1.2.0/pycups-1.9.49/Makefile.no-epydoc	2010-01-19 12:34:47.000000000 +0000
-+++ system-config-printer-1.2.0/pycups-1.9.49/Makefile	2010-03-17 14:36:52.248486676 +0000
+diff -up system-config-printer-1.2.2/pycups-1.9.49/Makefile.no-epydoc system-config-printer-1.2.2/pycups-1.9.49/Makefile
+--- system-config-printer-1.2.2/pycups-1.9.49/Makefile.no-epydoc	2010-03-10 09:45:10.000000000 +0000
++++ system-config-printer-1.2.2/pycups-1.9.49/Makefile	2010-05-18 12:57:39.226942671 +0100
 @@ -14,7 +14,9 @@ cups.so: $(SOURCES)
  
  doc:	cups.so
@@ -40,10 +40,10 @@ diff -up system-config-printer-1.2.0/pycups-1.9.49/Makefile.no-epydoc system-con
  
  clean:
  	-rm -rf build cups.so *.pyc *~
-diff -up system-config-printer-1.2.0/pysmbc-1.0.6/Makefile.no-epydoc system-config-printer-1.2.0/pysmbc-1.0.6/Makefile
---- system-config-printer-1.2.0/pysmbc-1.0.6/Makefile.no-epydoc	2008-10-20 15:51:14.000000000 +0100
-+++ system-config-printer-1.2.0/pysmbc-1.0.6/Makefile	2010-03-17 14:36:52.251484687 +0000
-@@ -12,7 +12,9 @@ smbc.so: $(SOURCES)
+diff -up system-config-printer-1.2.2/pysmbc-1.0.7/Makefile.no-epydoc system-config-printer-1.2.2/pysmbc-1.0.7/Makefile
+--- system-config-printer-1.2.2/pysmbc-1.0.7/Makefile.no-epydoc	2010-05-18 11:59:35.000000000 +0100
++++ system-config-printer-1.2.2/pysmbc-1.0.7/Makefile	2010-05-18 12:58:28.680066521 +0100
+@@ -8,7 +8,9 @@ smbc.so: $(SOURCES)
  
  doc: smbc.so
  	rm -rf html
@@ -53,4 +53,4 @@ diff -up system-config-printer-1.2.0/pysmbc-1.0.6/Makefile.no-epydoc system-conf
 +	mv $(patsubst %.so,%.html,$<) html
  
  clean:
- 	-rm -rf build smbc.so *.pyc *~
+ 	-rm -rf build smbc.so *.pyc tests/*.pyc *~ tests/*~
diff --git a/system-config-printer.spec b/system-config-printer.spec
index a3a5b4f..b20419a 100644
--- a/system-config-printer.spec
+++ b/system-config-printer.spec
@@ -1,5 +1,5 @@
 %global pycups_version 1.9.49
-%global pysmbc_version 1.0.6
+%global pysmbc_version 1.0.7
 %{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
 %{!?python_sitearch: %global python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 %{!?pyver: %global pyver %(%{__python} -c "import sys ; print sys.version[:3]")}
@@ -7,7 +7,7 @@
 Summary: A printer administration tool
 Name: system-config-printer
 Version: 1.2.2
-Release: 2%{?dist}
+Release: 3%{?dist}
 License: GPLv2+
 URL: http://cyberelk.net/tim/software/system-config-printer/
 Group: System Environment/Base
@@ -134,13 +134,13 @@ rm -rf %buildroot
 %files libs -f system-config-printer.lang
 %defattr(-,root,root,-)
 %doc --parents pycups-%{pycups_version}/{COPYING,ChangeLog,README,NEWS,TODO,examples,html}
-%doc --parents pysmbc-%{pysmbc_version}/{COPYING,ChangeLog,README,NEWS,TODO,test.py,html}
+%doc --parents pysmbc-%{pysmbc_version}/{COPYING,README,NEWS,TODO,html}
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/newprinternotification.conf
 %config(noreplace) %{_sysconfdir}/dbus-1/system.d/printerdriversinstaller.conf
 %{python_sitearch}/cups.so
 %{python_sitearch}/cups-1.0-py%{pyver}.egg-info
 %{python_sitearch}/smbc.so
-%{python_sitearch}/smbc-1.0-py%{pyver}.egg-info
+%{python_sitearch}/pysmbc-%{pysmbc_version}-py%{pyver}.egg-info
 %dir %{python_sitelib}/cupshelpers
 %{python_sitelib}/cupshelpers/__init__.py*
 %{python_sitelib}/cupshelpers/cupshelpers.py*
@@ -214,6 +214,9 @@ rm -rf %buildroot
 exit 0
 
 %changelog
+* Tue May 18 2010 Tim Waugh <twaugh@redhat.com> - 1.2.2-3
+- Updated pysmbc to 1.0.7.
+
 * Thu May 13 2010 Tim Waugh <twaugh@redhat.com> - 1.2.2-2
 - cups-pk-helper FileGet method requires directory it can write to
   (bug #587744).