diff -Nru smbldap-tools-0.9.9/debian/changelog smbldap-tools-0.9.9/debian/changelog
--- smbldap-tools-0.9.9/debian/changelog	2012-12-07 02:45:19.000000000 -0800
+++ smbldap-tools-0.9.9/debian/changelog	2016-06-08 09:13:11.000000000 -0700
@@ -1,3 +1,12 @@
+smbldap-tools (0.9.9-1ubuntu1.16.04.1) xenial; urgency=medium
+
+  * debian/patches/0022_read_smbldap-config.patch: Install smbldap-
+    config command.  Closes: #697225, LP: #997172.
+  * debian/patches/0023_add_pod_smbldap-config.patch: Add POD to smbldap-
+    config.pl.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Wed, 08 Jun 2016 08:49:39 -0700
+
 smbldap-tools (0.9.9-1ubuntu1) raring; urgency=low
 
   * Merge from Debian unstable (LP: #1054130). Remaining changes:
diff -Nru smbldap-tools-0.9.9/debian/patches/0022_read_smbldap-config.patch smbldap-tools-0.9.9/debian/patches/0022_read_smbldap-config.patch
--- smbldap-tools-0.9.9/debian/patches/0022_read_smbldap-config.patch	1969-12-31 16:00:00.000000000 -0800
+++ smbldap-tools-0.9.9/debian/patches/0022_read_smbldap-config.patch	2016-06-08 08:47:33.000000000 -0700
@@ -0,0 +1,27 @@
+Description: Install smbldap-config command
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/997172
+Origin: upstream, http://svn.gna.org/viewcvs/smbldap-tools/trunk/Makefile.in?r1=155&r2=156&
+Bug-Debian: https://bugs.debian.org/697225
+
+--- smbldap-tools-0.9.9.orig/Makefile.in
++++ smbldap-tools-0.9.9/Makefile.in
+@@ -17,7 +17,6 @@ BUILD_TARGETS= \
+ 	$(BUILD_PERL_MOD_TARGETS) \
+ 	$(BUILD_PERL_CMD_TARGETS) \
+ 	$(BUILD_PERL_MAN_TARGETS) \
+-	smbldap-config.cmd \
+ 	smbldap-upgrade-0.9.6.cmd \
+ 	doc/smb.conf.example \
+ 	doc/smb.smbldap.conf.example \
+@@ -43,7 +42,9 @@ PERL_CMD_SOURCES= \
+ 	smbldap-userinfo.pl \
+ 	smbldap-userlist.pl \
+ 	smbldap-usermod.pl \
+-	smbldap-usershow.pl
++	smbldap-usershow.pl \
++	smbldap-config.pl \
++	#
+ 
+ PERL_MAN_SECTION=	8
+ 
diff -Nru smbldap-tools-0.9.9/debian/patches/0023_add_pod_smbldap-config.patch smbldap-tools-0.9.9/debian/patches/0023_add_pod_smbldap-config.patch
--- smbldap-tools-0.9.9/debian/patches/0023_add_pod_smbldap-config.patch	1969-12-31 16:00:00.000000000 -0800
+++ smbldap-tools-0.9.9/debian/patches/0023_add_pod_smbldap-config.patch	2016-06-08 08:49:16.000000000 -0700
@@ -0,0 +1,31 @@
+Description: Add POD to smbldap-config.pl
+ Build fails otherwise.
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Origin: upstream, http://svn.gna.org/viewcvs/smbldap-tools?view=revision&revision=172
+Origin: upstream, http://svn.gna.org/viewcvs/smbldap-tools?view=revision&revision=173
+Bug: https://gna.org/support/?3013
+
+--- smbldap-tools-0.9.9.orig/smbldap-config.pl
++++ smbldap-tools-0.9.9/smbldap-config.pl
+@@ -557,3 +557,21 @@ print "  $smbldap_bind_conf done.\n";
+ $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').
++
++=cut
diff -Nru smbldap-tools-0.9.9/debian/patches/series smbldap-tools-0.9.9/debian/patches/series
--- smbldap-tools-0.9.9/debian/patches/series	2012-12-07 02:45:19.000000000 -0800
+++ smbldap-tools-0.9.9/debian/patches/series	2016-06-08 08:48:47.000000000 -0700
@@ -1,3 +1,5 @@
 0001_debian_nobody.patch
 0020_original_doc_html_index.patch
 0021_smbldap-useradd_flush_nscd_cache.patch
+0022_read_smbldap-config.patch
+0023_add_pod_smbldap-config.patch