diff -Nru hitori-3.22.4/debian/changelog hitori-3.22.4/debian/changelog
--- hitori-3.22.4/debian/changelog	2017-10-08 20:25:04.000000000 +0000
+++ hitori-3.22.4/debian/changelog	2017-10-13 22:48:50.000000000 +0000
@@ -1,16 +1,12 @@
-hitori (3.22.4-0ubuntu1) artful; urgency=medium
+hitori (3.22.4-1) unstable; urgency=medium
 
-  * New upstream translations release
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 08 Oct 2017 16:25:04 -0400
-
-hitori (3.22.3-1ubuntu1) artful; urgency=medium
-
-  * Merge from Debian Sid. Remaining changes:
-    - Build-depend on desktop-file-utils.
-    - Drop Build-Depends on intltool.
+  * Team upload.
+  * New upstream version 3.22.4.
+  * No longer build-depend on intltool. Build-depend on desktop-file-utils
+    instead. (Closes: #865773)
+  * Declare compliance with Debian Policy 4.1.1.
 
- -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 12 Aug 2017 11:36:36 -0500
+ -- Markus Koschany <apo@debian.org>  Sat, 14 Oct 2017 00:48:50 +0200
 
 hitori (3.22.3-1) unstable; urgency=medium
 
@@ -25,22 +21,6 @@
 
  -- Markus Koschany <apo@debian.org>  Fri, 23 Jun 2017 22:55:15 +0200
 
-hitori (3.22.3-0ubuntu1) artful; urgency=medium
-
-  * New upstream release
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 30 Apr 2017 18:38:55 -0400
-
-hitori (3.22.2-0ubuntu1) zesty; urgency=medium
-
-  * New upstream release
-  * Drop obsolete .xpm and menu (Closes: #856981)
-  * debian/control:
-    - Build-depend on desktop-file-utils
-    - Drop Build-Depends on intltool
-
- -- Jeremy Bicha <jbicha@ubuntu.com>  Sun, 05 Mar 2017 16:00:28 -0500
-
 hitori (3.22.0-1) unstable; urgency=medium
 
   * Team upload.
diff -Nru hitori-3.22.4/debian/control hitori-3.22.4/debian/control
--- hitori-3.22.4/debian/control	2017-10-08 20:25:04.000000000 +0000
+++ hitori-3.22.4/debian/control	2017-10-13 22:48:50.000000000 +0000
@@ -1,15 +1,14 @@
 Source: hitori
 Section: games
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Peter De Wachter <pdewacht@gmail.com>
 Build-Depends:
  debhelper (>= 10),
  desktop-file-utils,
  libgtk-3-dev (>= 3.15.0),
  yelp-tools
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
 Homepage: https://wiki.gnome.org/Apps/Hitori
 Vcs-Git: https://anonscm.debian.org/git/pkg-games/hitori.git
 Vcs-Browser: https://anonscm.debian.org/git/pkg-games/hitori.git