diff -Nru meep-mpi-default-1.2.1/debian/changelog meep-mpi-default-1.2.1/debian/changelog
--- meep-mpi-default-1.2.1/debian/changelog	2014-05-11 14:28:44.000000000 +0200
+++ meep-mpi-default-1.2.1/debian/changelog	2014-07-25 14:31:45.000000000 +0200
@@ -1,3 +1,12 @@
+meep-mpi-default (1.2.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+  * debian/control: build-depend on libhdf5-mpi-dev instead of
+    libhdf5-dev.
+
+ -- Gilles Filippini <pini@debian.org>  Fri, 25 Jul 2014 14:29:28 +0200
+
 meep-mpi-default (1.2.1-1) unstable; urgency=medium
 
   * new upstream version
diff -Nru meep-mpi-default-1.2.1/debian/control meep-mpi-default-1.2.1/debian/control
--- meep-mpi-default-1.2.1/debian/control	2014-05-12 15:04:28.000000000 +0200
+++ meep-mpi-default-1.2.1/debian/control	2014-07-25 14:30:36.000000000 +0200
@@ -11,7 +11,7 @@
   libharminv-dev (>= 1.1), 
   zlib1g-dev, 
   libfftw3-dev, 
-  libhdf5-dev, 
+  libhdf5-mpi-dev, 
   libgsl0-dev, 
   liblapack-dev, 
   mpi-default-dev, 
diff -Nru meep-mpi-default-1.2.1/debian/rules meep-mpi-default-1.2.1/debian/rules
--- meep-mpi-default-1.2.1/debian/rules	2014-05-12 14:37:11.000000000 +0200
+++ meep-mpi-default-1.2.1/debian/rules	2014-07-31 10:48:50.000000000 +0200
@@ -9,6 +9,15 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+# 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
+
 CONFIGURE_FLAGS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--prefix=/usr --mandir=\$${prefix}/share/man \
 	--infodir=\$${prefix}/share/info \