diff -Nru ncl-6.1.2/debian/changelog ncl-6.1.2/debian/changelog
--- ncl-6.1.2/debian/changelog	2014-03-25 15:55:44.000000000 +0100
+++ ncl-6.1.2/debian/changelog	2014-07-25 14:25:14.000000000 +0200
@@ -1,3 +1,10 @@
+ncl (6.1.2-7.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support hdf5 1.8.13 new packaging layout.
+
+ -- Gilles Filippini <pini@debian.org>  Fri, 25 Jul 2014 14:25:14 +0200
+
 ncl (6.1.2-7) unstable; urgency=medium
 
   * Add support for kFreeBSD, Hurd to support-archs.patch 
diff -Nru ncl-6.1.2/debian/LINUX.DEBIAN ncl-6.1.2/debian/LINUX.DEBIAN
--- ncl-6.1.2/debian/LINUX.DEBIAN	2014-03-25 15:55:44.000000000 +0100
+++ ncl-6.1.2/debian/LINUX.DEBIAN	2014-07-31 10:56:39.000000000 +0200
@@ -23,8 +23,12 @@
 #define        HDFlib  -lmfhdfalt -ldfalt -ljpeg -lz
 #define        HDFEOSlib   -lhdfeos -lgctp
 #define        HDFEOS5lib   -lhe5_hdfeos -lgctp
-#define        HDF5lib -lhdf5_hl -lhdf5 -lz
-#define        NetCDF4lib      -lhdf5_hl -lhdf5 
+/*
+ * $(HDF5_LDFLAGS) must not be substitued before built time because
+ * of buggy ymake who replaces $arch and $system with "1"
+ */
+#define        HDF5lib $(HDF5_LDFLAGS) -lhdf5_hl -lhdf5 -lz
+#define        NetCDF4lib    $(HDF5_LDFLAGS)  -lhdf5_hl -lhdf5
 #define	       GDALlib -lgdal
 
 #define NoMakeDepend
diff -Nru ncl-6.1.2/debian/rules ncl-6.1.2/debian/rules
--- ncl-6.1.2/debian/rules	2014-03-25 15:55:44.000000000 +0100
+++ ncl-6.1.2/debian/rules	2014-07-31 10:57:17.000000000 +0200
@@ -21,6 +21,11 @@
 FC := gfortran
 VERSION := 6.1.2
 
+ifneq ($(wildcard /usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial/libhdf5.so),)
+  CFLAGS += -I/usr/include/hdf5/serial
+  export HDF5_LDFLAGS := -Wl,-L/usr/lib/$(DEB_HOST_MULTIARCH)/hdf5/serial
+endif
+
 export LD_LIBRARY_PATH=$(TOPDIR)/shared:$(LIBDIR)/libfakeroot
 
 # We built it twice: first shared, to get the shared libraries (with -fpic -fPIC)
@@ -46,7 +51,7 @@
 	sed -e 's/@CC@/${CC}/' \
 	    -e 's/@FC@/${FC}/' \
 	    -e 's/@LD@/${CC}/' \
-	    -e 's/@CFLAGS@/${CFLAGS}/' \
+	    -e 's:@CFLAGS@:${CFLAGS}:' \
 	    -e 's/@FFLAGS@/${FFLAGS}/' \
 	    -e 's/@CPPFLAGS@/${CPPFLAGS}/' \
 	    -e 's/@LDFLAGS@/${LDFLAGS}/' \
@@ -55,7 +60,7 @@
 	sed -e 's/@CC@/${CC}/' \
 	    -e 's/@FC@/${FC}/' \
 	    -e 's/@LD@/${CC}/' \
-	    -e 's/@CFLAGS@/${CFLAGS}/' \
+	    -e 's:@CFLAGS@:${CFLAGS}:' \
 	    -e 's/@FFLAGS@/${FFLAGS}/' \
 	    -e 's/@CPPFLAGS@/${CPPFLAGS}/' \
 	    -e 's/@LDFLAGS@/${LDFLAGS}/' \