diff -u tessa-0.3.1/debian/changelog tessa-0.3.1/debian/changelog
--- tessa-0.3.1/debian/changelog
+++ tessa-0.3.1/debian/changelog
@@ -1,3 +1,10 @@
+tessa (0.3.1-6.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <pini@debian.org>  Sat, 26 Jul 2014 19:17:56 +0200
+
 tessa (0.3.1-6) unstable; urgency=low
 
   * Whoops. Only use MPI on supported arches.
diff -u tessa-0.3.1/debian/rules tessa-0.3.1/debian/rules
--- tessa-0.3.1/debian/rules
+++ tessa-0.3.1/debian/rules
@@ -6,9 +6,15 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  HDF5_CPPFLAGS := -I/usr/include/hdf5/serial
+  HDF5_LDFLAGS := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 CONFIG_OPTS = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	--cache-file=../config.cache --prefix=/usr \
-	CPPFLAGS=-DH5_USE_16_API
+	CPPFLAGS="$(HDF5_CPPFLAGS) -DH5_USE_16_API" \
+	LDFLAGS="$(HDF5_LDFLAGS)"
 
 clean:
 	dh_testdir