diff -Nru mpb-1.5/debian/changelog mpb-1.5/debian/changelog
--- mpb-1.5/debian/changelog	2014-05-02 22:15:45.000000000 +0200
+++ mpb-1.5/debian/changelog	2014-07-25 14:13:24.000000000 +0200
@@ -1,3 +1,10 @@
+mpb (1.5-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <pini@debian.org>  Fri, 25 Jul 2014 14:13:24 +0200
+
 mpb (1.5-1) unstable; urgency=low
 
   * upload to unstable
diff -Nru mpb-1.5/debian/rules mpb-1.5/debian/rules
--- mpb-1.5/debian/rules	2014-05-02 22:14:28.000000000 +0200
+++ mpb-1.5/debian/rules	2014-07-31 10:53:05.000000000 +0200
@@ -16,6 +16,15 @@
 DEST_DIR_MPI = $(CURDIR)/debian/build-tmp/mpb-mpi/usr
 LA_DIR = $(CURDIR)/debian/build-tmp
 
+# Which MPI implementation?
+# set ARCH_DEFAULT_MPI_IMPL
+include /usr/share/mpi-default-dev/debian_defaults
+
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/libhdf5.so),)
+  export DEB_CPPFLAGS_MAINT_APPEND := -I/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+  export DEB_LDFLAGS_MAINT_APPEND := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+endif
+
 %:
 	dh $@ --with autoreconf