diff -Nru pxp-1.2.8/debian/changelog pxp-1.2.8/debian/changelog
--- pxp-1.2.8/debian/changelog	2016-12-21 19:34:39.000000000 +0000
+++ pxp-1.2.8/debian/changelog	2017-07-10 15:27:08.000000000 +0000
@@ -1,3 +1,21 @@
+pxp (1.2.8-1ubuntu1) artful; urgency=medium
+
+  * Cherrypick upstream FTBFS fix for ocaml 4.04.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 10 Jul 2017 16:26:49 +0100
+
+pxp (1.2.8-1build3) artful; urgency=high
+
+  * No change rebuild against ocamlnet.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 10 Jul 2017 14:13:31 +0100
+
+pxp (1.2.8-1build2) artful; urgency=high
+
+  * No change rebuild against ocaml 4.04.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 03 Jul 2017 01:29:53 +0100
+
 pxp (1.2.8-1build1) zesty; urgency=medium
 
   * Rebuild against new OCaml ABI.
diff -Nru pxp-1.2.8/debian/control pxp-1.2.8/debian/control
--- pxp-1.2.8/debian/control	2016-08-12 12:06:43.000000000 +0000
+++ pxp-1.2.8/debian/control	2017-07-03 00:29:53.000000000 +0000
@@ -1,7 +1,8 @@
 Source: pxp
 Section: ocaml
 Priority: optional
-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian OCaml Maintainers <debian-ocaml-maint@lists.debian.org>
 Build-Depends:
  debhelper (>= 9),
  ocaml-nox,
diff -Nru pxp-1.2.8/debian/patches/1d64ea196a7018c807acb962a393e95cdccbc88b.patch pxp-1.2.8/debian/patches/1d64ea196a7018c807acb962a393e95cdccbc88b.patch
--- pxp-1.2.8/debian/patches/1d64ea196a7018c807acb962a393e95cdccbc88b.patch	1970-01-01 00:00:00.000000000 +0000
+++ pxp-1.2.8/debian/patches/1d64ea196a7018c807acb962a393e95cdccbc88b.patch	2017-07-10 15:26:43.000000000 +0000
@@ -0,0 +1,25 @@
+From 1d64ea196a7018c807acb962a393e95cdccbc88b Mon Sep 17 00:00:00 2001
+From: Gerd Stolpmann <gerd@figlyinc.com>
+Date: Tue, 28 Feb 2017 13:39:51 +0100
+Subject: [PATCH] removing double definition of exception
+
+---
+ src/pxp-engine/pxp_document.ml | 2 --
+ 1 file changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/src/pxp-engine/pxp_document.ml b/src/pxp-engine/pxp_document.ml
+index 08ba17a..0b84b1d 100644
+--- a/src/pxp-engine/pxp_document.ml
++++ b/src/pxp-engine/pxp_document.ml
+@@ -3398,8 +3398,6 @@ let find_all_elements ?deeply eltype base =
+ ;;
+ 
+ 
+-exception Skip;;
+-
+ let map_tree ~pre ?(post=(fun x -> x)) base =
+   let rec map_rec n =
+     let n' = pre n in
+--
+libgit2 0.24.0
+
diff -Nru pxp-1.2.8/debian/patches/series pxp-1.2.8/debian/patches/series
--- pxp-1.2.8/debian/patches/series	2016-08-12 12:05:19.000000000 +0000
+++ pxp-1.2.8/debian/patches/series	2017-07-10 15:26:43.000000000 +0000
@@ -1,2 +1,3 @@
 0001-Patch-Makefiles-so-that-stuff-is-installed-under-DES.patch
 0002-Avoid-dependending-on-a-missing-.txt-document.patch
+1d64ea196a7018c807acb962a393e95cdccbc88b.patch