diff --git a/smbldap-tools-0.9.10-export.patch b/smbldap-tools-0.9.10-export.patch
new file mode 100644
index 0000000..17c0849
--- /dev/null
+++ b/smbldap-tools-0.9.10-export.patch
@@ -0,0 +1,10 @@
+--- smbldap_tools.pl
++++ smbldap_tools.pl
+@@ -106,6 +106,7 @@
+   split_arg_comma
+   list_union
+   list_minus
++  account_base_rid
+   account_by_sid
+   user_by_uid
+   user_next_uid
diff --git a/smbldap-tools.spec b/smbldap-tools.spec
index e27dc4a..72cb3d4 100644
--- a/smbldap-tools.spec
+++ b/smbldap-tools.spec
@@ -1,12 +1,13 @@
 Summary:	User and group administration tools for Samba/OpenLDAP
 Name:		smbldap-tools
 Version:	0.9.10
-Release:	5%{?dist}
+Release:	6%{?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
+Patch2:		smbldap-tools-0.9.10-export.patch
 Patch10:	smbldap-tools-0.9.9-config.patch
 BuildArch:	noarch
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(id -nu)
@@ -26,9 +27,13 @@ groups and passwords.
 %setup -q
 
 # Add POD to smbldap-config so we don't generate an empty manpage
-# https://gna.org/support/index.php?3013
+# https://gna.org/support/?3013
 %patch1
 
+# Add missing export of account_base_rid, needed by smbldap_usermod
+# https://gna.org/support/?3213
+%patch2
+
 # Fedora integration
 %patch10
 
@@ -67,7 +72,12 @@ rm -rf %{buildroot}
 
 %files
 %defattr(-,root,root,-)
-%doc ChangeLog CONTRIBUTORS COPYING FILES INFRA INSTALL README TODO
+%if 0%{?_licensedir:1}
+%license COPYING
+%else
+%doc COPYING
+%endif
+%doc ChangeLog CONTRIBUTORS FILES INFRA INSTALL README TODO
 %doc doc/*.conf.example doc/migration_scripts/ doc/*.pdf
 %dir %{_sysconfdir}/smbldap-tools/
 %config(noreplace) %{_sysconfdir}/smbldap-tools/smbldap.conf
@@ -104,6 +114,11 @@ rm -rf %{buildroot}
 %{_mandir}/man8/smbldap-usershow.8*
 
 %changelog
+* Tue Feb 24 2015 Paul Howarth <paul@city-fan.org> - 0.9.10-6
+- Add missing export of account_base_rid, needed by smbldap_usermod (#1138608)
+  (https://gna.org/support/?3213)
+- Use %%license where possible
+
 * Wed Aug 27 2014 Jitka Plesnikova <jplesnik@redhat.com> - 0.9.10-5
 - Perl 5.20 rebuild