diff -ru gnome-user-docs-3.24.0.orig/debian/changelog gnome-user-docs-3.24.0/debian/changelog
--- gnome-user-docs-3.24.0.orig/debian/changelog	2017-04-11 19:35:59.000000000 +0200
+++ gnome-user-docs-3.24.0/debian/changelog	2017-05-03 14:12:41.784871887 +0200
@@ -1,3 +1,13 @@
+gnome-user-docs (3.24.0-0ubuntu2) artful; urgency=medium
+
+  * debian/rules:
+    - Don't install certain files - modified versions of most of them
+      are installed by ubuntu-docs instead (LP: #1687928).
+  * debian/control.in:
+    - Depend on ubuntu-docs.
+
+ -- Gunnar Hjalmarsson <gunnarhj@ubuntu.com>  Wed, 03 May 2017 14:12:00 +0200
+
 gnome-user-docs (3.24.0-0ubuntu1) zesty; urgency=medium
 
   * New upstream release (LP: #1681896)
diff -ru gnome-user-docs-3.24.0.orig/debian/control.in gnome-user-docs-3.24.0/debian/control.in
--- gnome-user-docs-3.24.0.orig/debian/control.in	2017-04-11 19:22:33.000000000 +0200
+++ gnome-user-docs-3.24.0/debian/control.in	2017-05-03 01:17:15.802758324 +0200
@@ -16,7 +16,8 @@
 Package: gnome-user-guide
 Architecture: all
 Depends: ${misc:Depends},
-         yelp (>= 3)
+         yelp (>= 3),
+         ubuntu-docs (>= 17.10.2~)
 Provides: gnome-user-docs
 Description: GNOME user's guide
  Documentation for using the GNOME desktop environment and its components.
diff -ru gnome-user-docs-3.24.0.orig/debian/rules gnome-user-docs-3.24.0/debian/rules
--- gnome-user-docs-3.24.0.orig/debian/rules	2016-09-20 11:15:46.000000000 +0200
+++ gnome-user-docs-3.24.0/debian/rules	2017-05-03 02:40:40.239155238 +0200
@@ -4,3 +4,24 @@
 
 %:
 	dh $@ --with gnome
+
+# Files which should not be installed. Modified versions are
+# installed by the ubuntu-docs package for most of those files.
+DO_NOT_INSTALL = \
+	about-this-guide.page \
+	get-involved.page \
+	help-irc.page \
+	help-mailing-list.page \
+	index.page \
+	keyboard-layouts.page \
+	more-help.page \
+	net-install-flash.page \
+	translate.page
+
+override_dh_auto_install:
+	dh_auto_install
+	for d in $(CURDIR)/debian/gnome-user-guide/usr/share/help/*/gnome-help; do \
+		cd $$d; \
+		rm $(DO_NOT_INSTALL); \
+	done
+