diff --git a/debian/changelog b/debian/changelog
index 8d5af67..5959975 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+hdf5 (1.8.8-7.1) UNRELEASED; urgency=low
+
+  * Non-maintainer upload.
+  * Rename parallel libs with a -mpi suffix to not conflict with the serial
+    version.
+
+ -- Julien Cristau <jcristau@debian.org>  Fri, 17 Feb 2012 11:36:46 +0100
+
 hdf5 (1.8.8-7) unstable; urgency=low
 
   * Now shlibs suggest both parallel or serial version to avoid problems
diff --git a/debian/libhdf5-mpich2-7.symbols b/debian/libhdf5-mpich2-7.symbols
index ce25d8e..f7505b9 100644
--- a/debian/libhdf5-mpich2-7.symbols
+++ b/debian/libhdf5-mpich2-7.symbols
@@ -1,4 +1,4 @@
-libhdf5.so.7 libhdf5-mpich2-7 #MINVER#
+libhdf5-mpi.so.7 libhdf5-mpich2-7 #MINVER#
  H5AC_BT2_HDR@Base 1.8.7
  H5AC_BT2_INT@Base 1.8.7
  H5AC_BT2_LEAF@Base 1.8.7
@@ -2464,7 +2464,7 @@ libhdf5.so.7 libhdf5-mpich2-7 #MINVER#
  HDsrand@Base 1.8.7
  HDstrtoll@Base 1.8.7
  epoch_marker_class@Base 1.8.7
-libhdf5_fortran.so.7 libhdf5-mpich2-7 #MINVER#
+libhdf5_fortran-mpi.so.7 libhdf5-mpich2-7 #MINVER#
  HD5f2cstring@Base 1.8.7
  HD5packFstring@Base 1.8.7
  __h5_dble_interface_MOD_h5aread_double_1@Base 1.8.7
@@ -3636,7 +3636,7 @@ libhdf5_fortran.so.7 libhdf5-mpich2-7 #MINVER#
  h5zunregister_c_@Base 1.8.7
  integer_types_@Base 1.8.7
  predefined_types_@Base 1.8.7
-libhdf5_hl.so.7 libhdf5-mpich2-7 #MINVER#
+libhdf5_hl-mpi.so.7 libhdf5-mpich2-7 #MINVER#
  H5DS_get_REFLIST_type@Base 1.8.7
  H5DS_is_reserved@Base 1.8.7
  H5DSattach_scale@Base 1.8.7
@@ -3808,7 +3808,7 @@ libhdf5_hl.so.7 libhdf5-mpich2-7 #MINVER#
  str_cset@Base 1.8.7
  str_pad@Base 1.8.7
  str_size@Base 1.8.7
-libhdf5hl_fortran.so.7 libhdf5-mpich2-7 #MINVER#
+libhdf5hl_fortran-mpi.so.7 libhdf5-mpich2-7 #MINVER#
  H5IM_get_palette@Base 1.8.7
  H5IMget_palettef@Base 1.8.7
  H5IMmake_image_24bitf@Base 1.8.7
diff --git a/debian/libhdf5-openmpi-7.symbols b/debian/libhdf5-openmpi-7.symbols
index 9286fa8..efe8639 100644
--- a/debian/libhdf5-openmpi-7.symbols
+++ b/debian/libhdf5-openmpi-7.symbols
@@ -1,4 +1,4 @@
-libhdf5.so.7 libhdf5-openmpi-7 #MINVER#
+libhdf5-mpi.so.7 libhdf5-openmpi-7 #MINVER#
  H5AC_BT2_HDR@Base 1.8.7
  H5AC_BT2_INT@Base 1.8.7
  H5AC_BT2_LEAF@Base 1.8.7
@@ -2463,7 +2463,7 @@ libhdf5.so.7 libhdf5-openmpi-7 #MINVER#
  HDsrand@Base 1.8.7
  HDstrtoll@Base 1.8.7
  epoch_marker_class@Base 1.8.7
-libhdf5_fortran.so.7 libhdf5-openmpi-7 #MINVER#
+libhdf5_fortran-mpi.so.7 libhdf5-openmpi-7 #MINVER#
  HD5f2cstring@Base 1.8.7
  HD5packFstring@Base 1.8.7
  __h5_dble_interface_MOD_h5aread_double_1@Base 1.8.7
@@ -3506,7 +3506,7 @@ libhdf5_fortran.so.7 libhdf5-openmpi-7 #MINVER#
  h5zunregister_c_@Base 1.8.7
  integer_types_@Base 1.8.7
  predefined_types_@Base 1.8.7
-libhdf5_hl.so.7 libhdf5-openmpi-7 #MINVER#
+libhdf5_hl-mpi.so.7 libhdf5-openmpi-7 #MINVER#
  H5DS_get_REFLIST_type@Base 1.8.7
  H5DS_is_reserved@Base 1.8.7
  H5DSattach_scale@Base 1.8.7
@@ -3678,7 +3678,7 @@ libhdf5_hl.so.7 libhdf5-openmpi-7 #MINVER#
  str_cset@Base 1.8.7
  str_pad@Base 1.8.7
  str_size@Base 1.8.7
-libhdf5hl_fortran.so.7 libhdf5-openmpi-7 #MINVER#
+libhdf5hl_fortran-mpi.so.7 libhdf5-openmpi-7 #MINVER#
  H5IM_get_palette@Base 1.8.7
  H5IMget_palettef@Base 1.8.7
  H5IMmake_image_24bitf@Base 1.8.7
diff --git a/debian/patches/series b/debian/patches/series
index 1ca0af8..3f29e61 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ mpi.diff
 path_max.diff
 ullong_force.diff
 comment.diff
+debian-changes
diff --git a/debian/rules b/debian/rules
index 6ded8a7..6d45608 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,7 +21,7 @@ virtpack = $(package)-$(major_version)
 
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_BUILD_ARCH      ?= $(shell dpkg-architecture -qDEB_BUILD_ARCH)
+DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib//" | sed "s/Depends: //" | sed "s/-dev//")
 
@@ -31,19 +31,19 @@ DEFAULT_MPI=$(shell dpkg -s mpi-default-dev | grep Depends | sed "s/Depends: lib
 ARCH_FLAG=-s
 ARCHS=alpha armel armhf amd64 i386 ia64 powerpc sparc kfreebsd-i386 kfreebsd-amd64 hurd-i386
 
-ifeq ($(DEB_BUILD_ARCH),arm)
+ifeq ($(DEB_HOST_ARCH),arm)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),hppa)
+else ifeq ($(DEB_HOST_ARCH),hppa)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),mips)
+else ifeq ($(DEB_HOST_ARCH),mips)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),mipsel)
+else ifeq ($(DEB_HOST_ARCH),mipsel)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),s390)
+else ifeq ($(DEB_HOST_ARCH),s390)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),s390x)
+else ifeq ($(DEB_HOST_ARCH),s390x)
 build_openmpi = no
-else ifeq ($(DEB_BUILD_ARCH),sh4)
+else ifeq ($(DEB_HOST_ARCH),sh4)
 build_openmpi = no
 else
 build_openmpi = yes