diff --git a/debian/changelog b/debian/changelog
index 75f0f7f..fdca7db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+ibutils (1.5.7-6) UNRELEASED; urgency=medium
+
+  * Update Maintainer field with "Debian HPC Team"
+  * Remove Ana Beatriz Guerrero Lopez from uploaders and add myself.
+    Thanks Ana for all your work!
+  * Move packaging Git repo to salsa.d.o and update Vcs-{Git,Browser}
+    accordingly.
+  * Run wrap-and-sort
+
+ -- Mehdi Dogguy <mehdi@debian.org>  Thu, 04 Jan 2018 12:29:43 +0100
+
 ibutils (1.5.7-5) unstable; urgency=medium
 
   * Fix Depends lines:
diff --git a/debian/control b/debian/control
index 210d3c1..1b0814e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,34 +1,45 @@
 Source: ibutils
 Section: net
 Priority: extra
-Maintainer: OFED and Debian Developement and Discussion <pkg-ofed-devel@lists.alioth.debian.org>
-Uploaders: Ana Beatriz Guerrero Lopez <ana@debian.org>
-Build-Depends: debhelper (>= 9), dh-autoreconf, swig, graphviz, tcl-dev (>= 8.6.0+6), tk-dev (>= 8.6.0+6), dpkg-dev (>= 1.16.0),
- libibumad-dev, libopensm-dev (>= 3.3.15)
+Maintainer: Debian HPC Team <debian-hpc@lists.debian.org>
+Uploaders: Mehdi Dogguy <mehdi@debian.org>
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
+               dpkg-dev (>= 1.16.0),
+               graphviz,
+               libibumad-dev,
+               libopensm-dev (>= 3.3.15),
+               swig,
+               tcl-dev (>= 8.6.0+6),
+               tk-dev (>= 8.6.0+6)
 Standards-Version: 3.9.7
-Vcs-Git: git://anonscm.debian.org/pkg-ofed/ibutils.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-ofed/ibutils.git
+Vcs-Git: https://salsa.debian.org/hpc-team/ibutils.git
+Vcs-Browser: https://salsa.debian.org/hpc-team/ibutils
 Homepage: https://www.openfabrics.org/downloads/ibutils/
 
 Package: ibutils
-Architecture: i386 ia64 amd64 powerpc ppc64el
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Architecture: amd64 i386 ia64 powerpc ppc64el
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Description: InfiniBand network utilities
  This package contains a set of utilities useful for
  diagnosing and testing InfiniBand based networks.
 
 Package: libibdm1
-Architecture: i386 ia64 amd64 powerpc ppc64el
+Architecture: amd64 i386 ia64 powerpc ppc64el
 Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
 Description: InfiniBand network diagnostic library
  This package contains a library for building tools useful
  for diagnosing and testing InfiniBand based networks.
 
 Package: libibdm-dev
 Section: libdevel
-Architecture: i386 ia64 amd64 powerpc ppc64el
-Depends: ${shlibs:Depends}, ${misc:Depends}, libibdm1 (= ${binary:Version})
+Architecture: amd64 i386 ia64 powerpc ppc64el
+Depends: libibdm1 (= ${binary:Version}),
+         ${misc:Depends},
+         ${shlibs:Depends}
 Description: Development files for the libibdm library
  This package contains header files for building applications
  against  libibdm, a library for building tools for
diff --git a/debian/copyright b/debian/copyright
index 0d15135..e4302f6 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -17,7 +17,7 @@
  This software is available to you under a choice of one of two
  licenses.  You may choose to be licensed under the terms of the GNU
  General Public License (GPL) Version 2, available from the file
- /usr/share/common-licenses/GPL-2 on your debian system or the 
+ /usr/share/common-licenses/GPL-2 on your debian system or the
  OpenIB.org BSD license below:
 
      Redistribution and use in source and binary forms, with or
@@ -45,5 +45,3 @@
 
 The Debian packaging is Copyright (C) 2009 Genome Research Ltd and
 is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
-
-
diff --git a/debian/ibutils.docs b/debian/ibutils.docs
index 85dc36d..32fabb0 100644
--- a/debian/ibutils.docs
+++ b/debian/ibutils.docs
@@ -1,4 +1,4 @@
+NEWS
+README
 ibdiag/doc/ibdiag_release_notes.txt
 ibdiag/doc/ibutils_release_notes_ofed1_4.txt
-README
-NEWS
diff --git a/debian/ibutils.install b/debian/ibutils.install
index 507e547..60ed7b2 100644
--- a/debian/ibutils.install
+++ b/debian/ibutils.install
@@ -1,4 +1,3 @@
-usr/share/man/man1
 usr/bin/ibdiagnet
 usr/bin/ibdiagpath
 usr/bin/ibdiagui
@@ -8,3 +7,4 @@
 usr/bin/ibis
 usr/bin/ibnlparse
 usr/bin/ibtopodiff
+usr/share/man/man1
diff --git a/debian/libibdm1.install b/debian/libibdm1.install
index 1a67165..beb685b 100644
--- a/debian/libibdm1.install
+++ b/debian/libibdm1.install
@@ -1,6 +1,6 @@
-usr/lib/*/lib*.so.*
-usr/lib/*/ibis1.5.7
 usr/lib/*/ibdiagnet1.5.7
 usr/lib/*/ibdiagpath1.5.7
+usr/lib/*/ibdiagui1.5.7
 usr/lib/*/ibdm1.5.7
-usr/lib/*/ibdiagui1.5.7
+usr/lib/*/ibis1.5.7
+usr/lib/*/lib*.so.*