diff -u libnss-ldap-264/debian/changelog libnss-ldap-264/debian/changelog
--- libnss-ldap-264/debian/changelog
+++ libnss-ldap-264/debian/changelog
@@ -1,3 +1,10 @@
+libnss-ldap (264-2.2ubuntu4) quantal; urgency=low
+
+  * Fix /usr/lib/libnss_ldap.so broken symlink and location, which was missed
+    when multiarch support was added (LP: #1020152).
+
+ -- Robie Basak <robie.basak@ubuntu.com>  Wed, 18 Jul 2012 14:20:27 +0100
+
 libnss-ldap (264-2.2ubuntu3) quantal; urgency=low
 
   * Change dependency on ldap-auth-config to a recommendation only, since
diff -u libnss-ldap-264/debian/rules libnss-ldap-264/debian/rules
--- libnss-ldap-264/debian/rules
+++ libnss-ldap-264/debian/rules
@@ -28,6 +28,10 @@
 DEB_DH_INSTALLINIT_ARGS = start . stop 20 0 1 6 .
 export LIBS=-lpthread
 
+binary-install/libnss-ldap::
+	dh_link -plibnss-ldap /lib/$(DEB_HOST_MULTIARCH)/libnss_ldap.so.2 \
+	      /usr/lib/$(DEB_HOST_MULTIARCH)/libnss_ldap.so
+
 # Keep file autoconf list out of the diff
 clean::
 	rm *.cdbs-config_list
reverted:
--- libnss-ldap-264/debian/libnss-ldap.links
+++ libnss-ldap-264.orig/debian/libnss-ldap.links
@@ -1 +0,0 @@
-/lib/libnss_ldap.so.2 usr/lib/libnss_ldap.so