diff --git a/debian/changelog b/debian/changelog
index 6475a0e..87c166d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+heimdal (7.1.0+dfsg-9ubuntu1) zesty; urgency=medium
+
+  * debian/patches/fix_ld_library_path: Fix LD_LIBRARY_PATH in test
+    script wrappers.  Closes LP: #1655839. Apply this via d/rules, as we
+    regenerate the libtool environment during the build.
+
+ -- Nishanth Aravamudan <nish.aravamudan@canonical.com>  Thu, 16 Feb 2017 09:56:03 -0800
+
 heimdal (7.1.0+dfsg-9) unstable; urgency=medium
 
   * Switch back to collab-maint URL until pkg-heimdal permissions are
diff --git a/debian/control b/debian/control
index 279e778..b2b9441 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: heimdal
 Section: net
 Priority: optional
-Maintainer: Brian May <bam@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Brian May <bam@debian.org>
 Uploaders: Jelmer Vernooij <jelmer@debian.org>
 Homepage: http://www.h5l.org/
 Standards-Version: 3.9.8
@@ -28,7 +29,8 @@ Build-Depends: bison,
                ss-dev,
                texinfo,
                unzip,
-               x11proto-core-dev
+               x11proto-core-dev,
+               patch
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/heimdal/
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/heimdal.git
 
diff --git a/debian/patches/fix_ld_library_path b/debian/patches/fix_ld_library_path
new file mode 100644
index 0000000..ff1c2be
--- /dev/null
+++ b/debian/patches/fix_ld_library_path
@@ -0,0 +1,41 @@
+Description: Fix LD_LIBRARY_PATH in test script wrappers
+ Since we use the system sqlite3, the system library path gets added to
+ temp_rpath/LD_LIBRARY_PATH. On Ubuntu, libldap-2.4-2 =>
+ libgssapi3-heimdal => libhcrypto4-heimdal (as well as in the buildd
+ schroots, apt-transport-https is installed by default which also pulls
+ in libldap-2.4-2), and so libhcrypto4-heimdal (the current example, but
+ other heimdal libraries could also trigger this) is installed when we
+ run the build-time tests.
+ .
+ We therefore encounter a bug when the system libhcrypto.so gets found
+ in the search path before the build-local version. The ABI may have
+ changed, but more importantly, we want to test the build-local version.
+ Fix temp_rpath like the other rpath variables to not insert the system
+ search path.
+Author: Nishanth Aravamudan <nish.aravamudan@canonical.com>
+Bug: https://github.com/heimdal/heimdal/issues/241
+Bug-Ubuntu: https://launchpad.net/bugs/1655839
+Last-Update: 2017-02-16
+
+--- heimdal-7.1.0+dfsg.orig/ltmain.sh
++++ heimdal-7.1.0+dfsg/ltmain.sh
+@@ -8092,9 +8092,16 @@ func_mode_link ()
+ 	    # We need to hardcode the library path
+ 	    if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
+ 	      # Make sure the rpath contains only unique directories.
+-	      case $temp_rpath: in
+-	      *"$absdir:"*) ;;
+-	      *) func_append temp_rpath "$absdir:" ;;
++	      # Skip directories that are in the system default run-time
++	      # search path.
++	      case " $sys_lib_dlsearch_path " in
++	      *" $absdir "*) ;;
++	      *)
++		case $temp_rpath: in
++		*"$absdir:"*) ;;
++		*) func_append temp_rpath "$absdir:" ;;
++		esac
++		;;
+ 	      esac
+ 	    fi
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 4146a35..e7956e0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@ parallel-build
 check_iprop_races
 disable_iprop
 canonical_host
+# fix_ld_library_path - applied at runtime
diff --git a/debian/rules b/debian/rules
index 53e7522..e40367d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_autoreconf:
 	dh_autoreconf --as-needed
+	patch -p1 < debian/patches/fix_ld_library_path
 
 override_dh_strip:
 	dh_strip --dbg-package=heimdal-dbg