diff -Nru ocamldsort-0.16.0/debian/changelog ocamldsort-0.16.0/debian/changelog
--- ocamldsort-0.16.0/debian/changelog	2015-11-03 20:16:21.000000000 +0000
+++ ocamldsort-0.16.0/debian/changelog	2016-11-06 09:07:32.000000000 +0000
@@ -1,20 +1,30 @@
-ocamldsort (0.16.0-2build3) xenial; urgency=medium
+ocamldsort (0.16.0-5) unstable; urgency=medium
 
-  * No-change rebuild against ocaml 4.02.
+  * Team upload
+  * Second try: Set DEB_BUILD_OPTIONS=parallel=1 in debian/rules
+  * Update Homepage field to set new upstream's location
+  * Update watch file
 
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>  Tue, 03 Nov 2015 14:16:21 -0600
+ -- Mehdi Dogguy <mehdi@debian.org>  Sun, 06 Nov 2016 10:07:32 +0100
 
-ocamldsort (0.16.0-2build2) xenial; urgency=medium
+ocamldsort (0.16.0-4) unstable; urgency=medium
 
-  * No-change rebuild against ocaml 4.02.
+  * Team upload.
+  * Disable parallel build [1] to avoid FTBFS (Closes: #841758).
+    [1] Parallel build in enabled by default in Debhelper compat
+        level 10.
 
- -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@canonical.com>  Tue, 03 Nov 2015 14:13:13 -0600
+ -- Mehdi Dogguy <mehdi@debian.org>  Sat, 05 Nov 2016 23:33:17 +0100
 
-ocamldsort (0.16.0-2build1) trusty; urgency=medium
+ocamldsort (0.16.0-3) unstable; urgency=low
 
-  * Rebuild for ocaml-4.01.
+  * debian/control: updated homepage
+  * Standards-Version 3.9.8 (no change)
+  * debhelper compat level 10
+  * update Vcs-{Git,Browser}
+  * patch manpage: fix a typo in ocamldsort(1)
 
- -- Matthias Klose <doko@ubuntu.com>  Mon, 23 Dec 2013 12:11:38 +0000
+ -- Ralf Treinen <treinen@debian.org>  Tue, 25 Oct 2016 20:09:26 +0200
 
 ocamldsort (0.16.0-2) unstable; urgency=low
 
diff -Nru ocamldsort-0.16.0/debian/compat ocamldsort-0.16.0/debian/compat
--- ocamldsort-0.16.0/debian/compat	2013-05-09 18:32:26.000000000 +0000
+++ ocamldsort-0.16.0/debian/compat	2016-11-05 22:27:07.000000000 +0000
@@ -1 +1 @@
-8
+10
diff -Nru ocamldsort-0.16.0/debian/control ocamldsort-0.16.0/debian/control
--- ocamldsort-0.16.0/debian/control	2013-05-09 18:32:26.000000000 +0000
+++ ocamldsort-0.16.0/debian/control	2016-11-06 09:06:04.000000000 +0000
@@ -3,12 +3,12 @@
 Priority: optional
 Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Uploaders: Ralf Treinen <treinen@debian.org>
-Build-Depends: debhelper (>= 8),
+Build-Depends: debhelper (>= 10),
 	       ocaml-nox (>= 3.09.0), camlp4,  dh-ocaml (>= 0.9)
-Standards-Version: 3.9.4
-Homepage: http://dimitri.mutu.net/informatique.html
-Vcs-Git: git://git.debian.org/git/pkg-ocaml-maint/packages/ocamldsort.git
-Vcs-Browser: http://git.debian.org/?p=pkg-ocaml-maint/packages/ocamldsort.git
+Standards-Version: 3.9.8
+Homepage: http://iml.univ-mrs.fr/~ara/programmes.html.en
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-ocaml-maint/packages/ocamldsort.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-ocaml-maint/packages/ocamldsort.git
 
 Package: ocamldsort
 Architecture: any
diff -Nru ocamldsort-0.16.0/debian/patches/manpage ocamldsort-0.16.0/debian/patches/manpage
--- ocamldsort-0.16.0/debian/patches/manpage	1970-01-01 00:00:00.000000000 +0000
+++ ocamldsort-0.16.0/debian/patches/manpage	2016-11-05 16:27:04.000000000 +0000
@@ -0,0 +1,16 @@
+Author: Ralf Treinen < treinen@debian.org>
+Description: typo in manpage
+
+Index: ocamldsort/ocamldsort.1
+===================================================================
+--- ocamldsort.orig/ocamldsort.1	2016-10-25 09:06:15.180706933 +0200
++++ ocamldsort/ocamldsort.1	2016-10-25 20:07:44.857832791 +0200
+@@ -144,7 +144,7 @@
+ 
+ .TP
+ .BI \-nox
+-Ignore filenames containg `*' so that unexpanded wildcards are ignored.
++Ignore filenames containing `*' so that unexpanded wildcards are ignored.
+ 
+ .TP
+ .BI \-obj
diff -Nru ocamldsort-0.16.0/debian/patches/series ocamldsort-0.16.0/debian/patches/series
--- ocamldsort-0.16.0/debian/patches/series	1970-01-01 00:00:00.000000000 +0000
+++ ocamldsort-0.16.0/debian/patches/series	2016-11-05 16:27:04.000000000 +0000
@@ -0,0 +1 @@
+manpage
diff -Nru ocamldsort-0.16.0/debian/rules ocamldsort-0.16.0/debian/rules
--- ocamldsort-0.16.0/debian/rules	2013-05-09 18:32:26.000000000 +0000
+++ ocamldsort-0.16.0/debian/rules	2016-11-06 09:01:32.000000000 +0000
@@ -3,6 +3,8 @@
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+DEB_BUILD_OPTIONS=parallel=1
+
 %:
 	dh $@ --with=ocaml
 
diff -Nru ocamldsort-0.16.0/debian/watch ocamldsort-0.16.0/debian/watch
--- ocamldsort-0.16.0/debian/watch	2013-05-09 18:32:26.000000000 +0000
+++ ocamldsort-0.16.0/debian/watch	2016-11-06 09:07:03.000000000 +0000
@@ -1,3 +1,3 @@
 version=3
 opts=pasv \
-ftp://quatramaran.ens.fr/pub/ara/ocamldsort/ocamldsort-(.*)\.tar\.gz
+ftp://quatramaran.salle-s.org/pub/ara/ocamldsort/ocamldsort-(.*)\.tar\.gz