diff -Nru cdo-1.6.4+dfsg.1/debian/changelog cdo-1.6.4+dfsg.1/debian/changelog
--- cdo-1.6.4+dfsg.1/debian/changelog	2014-07-09 09:45:17.000000000 +0200
+++ cdo-1.6.4+dfsg.1/debian/changelog	2014-07-24 14:53:22.000000000 +0200
@@ -1,3 +1,10 @@
+cdo (1.6.4+dfsg.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <pini@debian.org>  Thu, 24 Jul 2014 14:53:22 +0200
+
 cdo (1.6.4+dfsg.1-2) unstable; urgency=medium
 
   * Add limits.h; UCHAR_MAX not defined elsewhere on some archs
diff -Nru cdo-1.6.4+dfsg.1/debian/rules cdo-1.6.4+dfsg.1/debian/rules
--- cdo-1.6.4+dfsg.1/debian/rules	2014-07-09 09:45:17.000000000 +0200
+++ cdo-1.6.4+dfsg.1/debian/rules	2014-07-31 09:08:02.000000000 +0200
@@ -57,6 +57,12 @@
   WITH_MAGICS:=
 endif
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  WITH_HDF5:=--with-hdf5=/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+else
+  WITH_HDF5:=--with-hdf5=/usr
+endif
+
 override_dh_auto_clean:
 	dh_auto_clean	|| echo "distclean ok"
 	#rm -f cdo.settings src/config.h  libtool libcdi/config.log libcdi/config.status src/stamp-h1 confdefs.h
@@ -79,7 +85,7 @@
 override_dh_auto_configure:
 	ln -sf /usr/include/cfortran.h libcdi/src/cfortran.h 
 	  ./configure --prefix=/usr --libdir=$(LIBDIR) \
-		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr --with-hdf5=/usr \
+		--enable-cdi-lib --with-zlib=/usr --with-netcdf=/usr  --with-proj=/usr $(WITH_HDF5) \
 		--enable-iso-c-interface  \
 		 $(WITH_GRIB) $(WITH_JASPER) $(WITH_MAGICS)  FC=gfortran \
 		LIBS="-Wl,-Bstatic -lpng -ljasper -lm -ljpeg -lz -Wl,-Bdynamic -lcurl" \