diff -Nru code-saturne-3.3.1/debian/changelog code-saturne-3.3.1/debian/changelog
--- code-saturne-3.3.1/debian/changelog	2014-07-14 15:27:45.000000000 +0200
+++ code-saturne-3.3.1/debian/changelog	2014-07-24 16:15:19.000000000 +0200
@@ -1,3 +1,10 @@
+code-saturne (3.3.1-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <pini@debian.org>  Thu, 24 Jul 2014 16:15:19 +0200
+
 code-saturne (3.3.1-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru code-saturne-3.3.1/debian/rules code-saturne-3.3.1/debian/rules
--- code-saturne-3.3.1/debian/rules	2014-07-14 15:26:32.000000000 +0200
+++ code-saturne-3.3.1/debian/rules	2014-07-31 09:22:36.000000000 +0200
@@ -5,7 +5,18 @@
 include /usr/share/cdbs/1/class/autotools.mk
 include /usr/share/cdbs/1/rules/autoreconf.mk
 
+# Which MPI implementation?
+# set ARCH_DEFAULT_MPI_IMPL
+include /usr/share/mpi-default-dev/debian_defaults
+
 DEB_CONFIGURE_USER_FLAGS := --with-syrthes=/usr/lib/syrthes/ --with-mpi  --libexecdir=/usr/lib/
+
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)/libhdf5.so),)
+  DEB_CONFIGURE_USER_FLAGS += \
+	--with-hdf5-include=/usr/include/hdf5/$(ARCH_DEFAULT_MPI_IMPL) \
+	--with-hdf5-lib=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/$(ARCH_DEFAULT_MPI_IMPL)
+endif
+
 #--libdir=/usr/lib/code_saturne
 DEB_MAKE_BUILD_TARGET    := all
 DEB_MAKE_INSTALL_TARGET  := install DESTDIR=`pwd`/debian/tmp