diff -Nru infiniband-diags-1.6.1/debian/changelog infiniband-diags-1.6.1/debian/changelog
--- infiniband-diags-1.6.1/debian/changelog	2015-07-17 16:39:34.000000000 +0000
+++ infiniband-diags-1.6.1/debian/changelog	2015-07-17 17:19:12.000000000 +0000
@@ -1,3 +1,9 @@
+infiniband-diags (1.6.1-1ubuntu2) trusty; urgency=medium
+
+  * Cherry-pick --with-ibpath_override from utopic (LP: #1450896)
+
+ -- Adam Conrad <adconrad@ubuntu.com>  Fri, 17 Jul 2015 11:14:35 -0600
+
 infiniband-diags (1.6.1-1ubuntu1) trusty; urgency=medium
 
   * Enable building on all Linux architectures (LP: #1414818)
diff -Nru infiniband-diags-1.6.1/debian/rules infiniband-diags-1.6.1/debian/rules
--- infiniband-diags-1.6.1/debian/rules	2012-12-04 09:21:26.000000000 +0000
+++ infiniband-diags-1.6.1/debian/rules	2015-07-17 17:14:13.000000000 +0000
@@ -7,6 +7,9 @@
 override_dh_autoreconf:
 	dh_autoreconf autoreconf -- -f -i -I config
 
+override_dh_auto_configure:
+	dh_auto_configure -- --with-ibpath_override=/usr/sbin
+
 override_dh_install:
 	mv debian/tmp/usr/sbin/ibfindnodesusing.pl debian/tmp/usr/sbin/ibfindnodesusing
 	mv debian/tmp/usr/sbin/ibidsverify.pl debian/tmp/usr/sbin/ibidsverify