diff -Nru xmds2-2.2.0+dfsg1/debian/changelog xmds2-2.2.0+dfsg1/debian/changelog
--- xmds2-2.2.0+dfsg1/debian/changelog	2014-04-09 20:04:41.000000000 +0200
+++ xmds2-2.2.0+dfsg1/debian/changelog	2014-07-26 20:14:09.000000000 +0200
@@ -1,3 +1,10 @@
+xmds2 (2.2.0+dfsg1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <pini@debian.org>  Sat, 26 Jul 2014 20:14:09 +0200
+
 xmds2 (2.2.0+dfsg1-2) unstable; urgency=medium
 
   * Team upload.
diff -Nru xmds2-2.2.0+dfsg1/debian/rules xmds2-2.2.0+dfsg1/debian/rules
--- xmds2-2.2.0+dfsg1/debian/rules	2014-04-09 20:04:01.000000000 +0200
+++ xmds2-2.2.0+dfsg1/debian/rules	2014-07-31 18:57:05.000000000 +0200
@@ -3,6 +3,11 @@
 
 XMDS_USER_DATA = $(CURDIR)/debian/xmds-user-data
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  HDF5_PATHS := --include-path=/usr/include/hdf5/serial \
+	--lib-path=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 #DH_VERBOSE=1
 
 %:
@@ -19,7 +24,7 @@
           export OMPI_MCA_plm_rsh_agent=/bin/false ;	\
 	  mkdir bin-test ;				\
 	  install -m 755 bin/* bin-test ; 		\
-	  xmds2 --reconfigure ;				\
+	  xmds2 --reconfigure $(HDF5_PATHS) ;		\
 	  ./run_tests.py ;				\
 	  cd ./examples ;				\
 	  xmds2 lorenz.xmds ;				\