diff -pruN 2.13.22-1/debian/changelog 2.13.22-1ubuntu1/debian/changelog
--- 2.13.22-1/debian/changelog	2014-06-11 05:13:52.000000000 +0000
+++ 2.13.22-1ubuntu1/debian/changelog	2015-01-04 01:17:25.000000000 +0000
@@ -1,3 +1,11 @@
+zope2.13 (2.13.22-1ubuntu1) vivid; urgency=low
+
+  * Merge from Debian unstable.  Remaining changes:
+    - debian/rules:
+      + Fix installation of README file, fixes FTBFS.
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Sun, 04 Jan 2015 02:14:48 +0100
+
 zope2.13 (2.13.22-1) unstable; urgency=medium
 
   * New upstream release.
@@ -9,6 +17,12 @@ zope2.13 (2.13.22-1) unstable; urgency=m
 
  -- Arnaud Fontaine <arnau@debian.org>  Wed, 11 Jun 2014 14:13:48 +0900
 
+zope2.13 (2.13.21-1ubuntu1) trusty; urgency=medium
+
+  * Fix installation of README file.
+
+ -- Matthias Klose <doko@ubuntu.com>  Wed, 02 Apr 2014 09:55:51 +0200
+
 zope2.13 (2.13.21-1) unstable; urgency=high
 
   * New upstream release fixing security issues.
diff -pruN 2.13.22-1/debian/control 2.13.22-1ubuntu1/debian/control
--- 2.13.22-1/debian/control	2013-09-11 07:51:07.000000000 +0000
+++ 2.13.22-1ubuntu1/debian/control	2015-01-04 01:15:09.000000000 +0000
@@ -1,7 +1,8 @@
 Source: zope2.13
 Section: zope
 Priority: optional
-Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian/Ubuntu Zope Team <pkg-zope-developers@lists.alioth.debian.org>
 Uploaders: Jonas Meurer <mejo@debian.org>,
            Arnaud Fontaine <arnau@debian.org>
 Build-Depends: debhelper (>= 7.0.50~), lsb-release, python (>= 2.7.3-1~),
diff -pruN 2.13.22-1/debian/rules 2.13.22-1ubuntu1/debian/rules
--- 2.13.22-1/debian/rules	2013-05-17 09:20:36.000000000 +0000
+++ 2.13.22-1ubuntu1/debian/rules	2014-06-11 10:38:48.000000000 +0000
@@ -89,9 +89,14 @@ override_dh_auto_install:
 	rm -r $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/lib/python/*/EGG-INFO/scripts
 
 	cp $(DEBIAN)/python_interpreter_template $(DEBIAN)/$(ZOPE)/usr/lib/$(ZOPE)/bin/python
+
+override_dh_installdocs:
+	dh_installdocs
 ifeq ($(distribution),Ubuntu)
-	mv $(DEBIAN)/$(ZOPE)-sandbox/usr/share/doc/$(ZOPE)-sandbox/README.Debian \
-		$(DEBIAN)/$(ZOPE)-sandbox/usr/share/doc/$(ZOPE)-sandbox/README.Ubuntu
+	if [ -f $(DEBIAN)/$(ZOPE)-sandbox/usr/share/doc/$(ZOPE)-sandbox/README.Debian; then \
+	    mv $(DEBIAN)/$(ZOPE)-sandbox/usr/share/doc/$(ZOPE)-sandbox/README.Debian \
+		$(DEBIAN)/$(ZOPE)-sandbox/usr/share/doc/$(ZOPE)-sandbox/README.Ubuntu; \
+	fi
 endif
 
 override_dh_python2: