diff --git a/smbldap-tools-0.9.10-pod.patch b/smbldap-tools-0.9.10-pod.patch
new file mode 100644
index 0000000..862e44b
--- /dev/null
+++ b/smbldap-tools-0.9.10-pod.patch
@@ -0,0 +1,27 @@
+POD needed to avoid empty manpage and breaking build
+
+https://gna.org/support/index.php?3013
+
+--- smbldap-config.pl
++++ smbldap-config.pl
+@@ -557,3 +557,20 @@
+ $mode=0600;
+ chmod $mode,"$smbldap_bind_conf","$smbldap_bind_conf.old";
+ 
++__END__
++
++=head1 NAME
++
++smbldap-config - Configure the smbldap-tools
++
++=head1 SYNOPSIS
++
++smbldap-config
++
++=head1 DESCRIPTION
++
++An interactive script to configure the smbldap-tools to work with your
++existing LDAP server(s). Before running it, you should ensure that your
++samba controller is up and running, and that the domain SID is defined
++(you can check it by running 'net getlocalsid').
++
diff --git a/smbldap-tools.spec b/smbldap-tools.spec
index e80fcdb..2a946aa 100644
--- a/smbldap-tools.spec
+++ b/smbldap-tools.spec
@@ -1,15 +1,17 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
-Version:	0.9.9
-Release:	2%{?dist}
+Version:	0.9.10
+Release:	1%{?dist}
 License:	GPLv2+
 Group:		System Environment/Base
 URL:		http://gna.org/projects/smbldap-tools/
 Source0:	http://download.gna.org/smbldap-tools/sources/%{version}/smbldap-tools-%{version}.tar.gz
+Patch1:		smbldap-tools-0.9.10-pod.patch
 Patch10:	smbldap-tools-0.9.9-config.patch
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
 BuildRequires:	openssl
+BuildRequires:	/usr/bin/pod2man
 Requires:	perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 # Need perl(IO::Socket::SSL) for LDAP over SSL (#122066, #207430)
 Requires:	perl(IO::Socket::SSL)
@@ -23,6 +25,10 @@ groups and passwords.
 %prep
 %setup -q
 
+# Add POD to smbldap-config so we don't generate an empty manpage
+# https://gna.org/support/index.php?3013
+%patch1
+
 # Fedora integration
 %patch10
 
@@ -62,10 +68,11 @@ rm -rf %{buildroot}
 %files
 %defattr(-,root,root,-)
 %doc ChangeLog CONTRIBUTORS COPYING FILES INFRA INSTALL README TODO
-%doc smbldap-config.pl doc/*.conf.example doc/migration_scripts/ doc/*.pdf
+%doc doc/*.conf.example doc/migration_scripts/ doc/*.pdf
 %dir %{_sysconfdir}/smbldap-tools/
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap_bind.conf
+%{_sbindir}/smbldap-config
 %{_sbindir}/smbldap-groupadd
 %{_sbindir}/smbldap-groupdel
 %{_sbindir}/smbldap-grouplist
@@ -81,6 +88,7 @@ rm -rf %{buildroot}
 %{_sbindir}/smbldap-userinfo
 %{_sbindir}/smbldap-usershow
 %{perl_vendorlib}/smbldap_tools.pm
+%{_mandir}/man8/smbldap-config.8*
 %{_mandir}/man8/smbldap-groupadd.8*
 %{_mandir}/man8/smbldap-groupdel.8*
 %{_mandir}/man8/smbldap-grouplist.8*
@@ -96,6 +104,22 @@ rm -rf %{buildroot}
 %{_mandir}/man8/smbldap-usershow.8*
 
 %changelog
+* Fri Feb 15 2013 Paul Howarth <paul@city-fan.org> - 0.9.10-1
+- Update to 0.9.10
+  - smbldap_tools.pm: read_user_human_readable: Protect attribute values from
+    Encode::decode_utf8() with Encode::FB_CROAK
+  - smbldap_tools.pm: add is_attr_single_value() to check if a specified
+    attribute is defined as single-value in the LDAP schema
+  - smbldap-useradd, smbldap-usermod: check if mailRoutingAddress attribute is
+    single-value or not
+  - smbldap-usermod: remove mailRoutingAddress attribute if empty
+  - smbldap-usermod: suppress "no such attribute" error on remove mail or
+    mailLocalAddress attribute when already absent
+- BR: /usr/bin/pod2man for man page generation
+- smbldap-config now a regular script rather than treated as documentation
+- Add POD to smbldap-config so we don't generate an empty manpage
+  (https://gna.org/support/index.php?3013)
+
 * Fri Feb 15 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.9.9-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
 
diff --git a/sources b/sources
index 4b8b854..fd31106 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-5084011003239a60ebe209c5fb570397  smbldap-tools-0.9.9.tar.gz
+f52a626637c468d66a4e71f30c174873  smbldap-tools-0.9.10.tar.gz