diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/changelog hdf-eos5-5.1.15.dfsg.1/debian/changelog
--- hdf-eos5-5.1.15.dfsg.1/debian/changelog	2014-07-08 14:00:31.000000000 +0200
+++ hdf-eos5-5.1.15.dfsg.1/debian/changelog	2014-07-25 11:19:40.000000000 +0200
@@ -1,3 +1,11 @@
+hdf-eos5 (5.1.15.dfsg.1-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+  * Fix patch libtool_fixes.patch to not drop predefined LDFLAGS.
+
+ -- Gilles Filippini <pini@debian.org>  Fri, 25 Jul 2014 11:17:50 +0200
+
 hdf-eos5 (5.1.15.dfsg.1-2) unstable; urgency=medium
 
   * Fix for missing function H5_EHHEisHE5 : misplaced ifdef.
diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/patches/hdf_hl.patch hdf-eos5-5.1.15.dfsg.1/debian/patches/hdf_hl.patch
--- hdf-eos5-5.1.15.dfsg.1/debian/patches/hdf_hl.patch	2014-07-08 14:00:31.000000000 +0200
+++ hdf-eos5-5.1.15.dfsg.1/debian/patches/hdf_hl.patch	2014-07-25 11:22:09.000000000 +0200
@@ -24,7 +24,7 @@
 @@ -11,6 +11,7 @@
  # Set LDFLAGS to allow the HDF-EOS library to use extern variables from
  # HDF5
- LDFLAGS= -shrext .so 
+ LDFLAGS+= -shrext .so 
 +LIBS= -lgctp -lhdf5_hl -lhdf5 -lm 
  
  # Build HDF-EOS5
diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/patches/libtool_fixes.patch hdf-eos5-5.1.15.dfsg.1/debian/patches/libtool_fixes.patch
--- hdf-eos5-5.1.15.dfsg.1/debian/patches/libtool_fixes.patch	2014-07-08 14:00:31.000000000 +0200
+++ hdf-eos5-5.1.15.dfsg.1/debian/patches/libtool_fixes.patch	2014-07-25 11:20:56.000000000 +0200
@@ -12,7 +12,7 @@
  # Set LDFLAGS to allow the HDF-EOS library to use extern variables from
  # HDF5
 -LDFLAGS=-Wl,-single_module
-+LDFLAGS= -shrext .so 
++LDFLAGS+= -shrext .so 
  
  # Build HDF-EOS5
  lib_LTLIBRARIES=libhe5_hdfeos.la
diff -Nru hdf-eos5-5.1.15.dfsg.1/debian/rules hdf-eos5-5.1.15.dfsg.1/debian/rules
--- hdf-eos5-5.1.15.dfsg.1/debian/rules	2014-07-08 14:00:31.000000000 +0200
+++ hdf-eos5-5.1.15.dfsg.1/debian/rules	2014-07-31 10:01:08.000000000 +0200
@@ -13,11 +13,16 @@
 
 # Disable checks: known bad test case ignored this release
 DEB_CONFIGURE_EXTRA_FLAGS :=  --enable-shared --with-pic
+
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  DEB_CONFIGURE_EXTRA_FLAGS += --with-hdf5=/usr/include/hdf5/serial,/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 export DEB_CFLAGS_MAINT_APPEND=-D_HDFEOS5_THREADSAFE -D_HDFEOS5_THREADSAFE -Df2cFortran -I/usr/include/hdf
 export DEB_LDFLAGS_MAINT_APPEND=-lpthread
 
-override_dh_configure:
-	dh_configure --  --enable-shared --with-pic 
+override_dh_auto_configure:
+	dh_auto_configure -- $(DEB_CONFIGURE_EXTRA_FLAGS)
 	# Needed for the pthreads tests
 	cp  samples/simple.txt testdrivers/threads