diff -Nru capstone-3.0.4/debian/changelog capstone-3.0.4/debian/changelog
--- capstone-3.0.4/debian/changelog	2017-07-30 12:26:50.000000000 +0000
+++ capstone-3.0.4/debian/changelog	2018-04-21 13:54:38.000000000 +0000
@@ -1,3 +1,24 @@
+capstone (3.0.4-5) unstable; urgency=medium
+
+  * Team upload
+  * Add python3-distutils dependency to python3-capstone (Closes: #896265)
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 21 Apr 2018 15:54:38 +0200
+
+capstone (3.0.4-4) unstable; urgency=medium
+
+  * Team upload
+  [ Raphaël Hertzog ]
+  * Set Maintainer field to Debian Security Tools
+    <team+pkg-security@tracker.debian.org>
+  * Update Vcs-Git and Vcs-Browser for the move to salsa.debian.org
+
+  [ Hilko Bengen ]
+  * Bump Standards-Version, Debhelper compat level
+  * Add Multi-Arch support
+
+ -- Hilko Bengen <bengen@debian.org>  Sat, 31 Mar 2018 23:04:14 +0200
+
 capstone (3.0.4-3) unstable; urgency=medium
 
   * Fix chroot build and add proper python3 dependency
diff -Nru capstone-3.0.4/debian/compat capstone-3.0.4/debian/compat
--- capstone-3.0.4/debian/compat	2017-07-05 08:56:47.000000000 +0000
+++ capstone-3.0.4/debian/compat	2018-03-31 20:33:46.000000000 +0000
@@ -1 +1 @@
-9
+10
diff -Nru capstone-3.0.4/debian/control capstone-3.0.4/debian/control
--- capstone-3.0.4/debian/control	2017-07-30 12:13:11.000000000 +0000
+++ capstone-3.0.4/debian/control	2018-04-21 13:53:04.000000000 +0000
@@ -1,21 +1,23 @@
 Source: capstone
 Priority: optional
-Maintainer: Pranith Kumar <bobby.prani@gmail.com>
+Maintainer: Debian Security Tools <team+pkg-security@tracker.debian.org>
+Uploaders: Pranith Kumar <bobby.prani@gmail.com>
 X-Python-Version: >= 2.7
 X-Python3-Version: >= 3.5
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 10),
                dh-python,
                python-all-dev, python3-all-dev,
-               cython (>= 0.19), cython3
-Standards-Version: 3.9.8
+               cython (>= 0.19), cython3,
+Standards-Version: 4.1.3
 Section: devel
 Homepage: http://www.capstone-engine.org/
-Vcs-Git: git://anonscm.debian.org/collab-maint/capstone.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=collab-maint/capstone.git;a=summary
+Vcs-Git: https://salsa.debian.org/pkg-security-team/capstone.git
+Vcs-Browser: https://salsa.debian.org/pkg-security-team/capstone
 
 Package: libcapstone-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
 Depends: libcapstone3 (= ${binary:Version}), ${misc:Depends}
 Description: lightweight multi-architecture disassembly framework - devel files
  Capstone is a lightweight multi-platform, multi-architecture disassembly
@@ -26,6 +28,7 @@
 Package: libcapstone3
 Section: libs
 Architecture: any
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: lightweight multi-architecture disassembly framework - library
  Capstone is a lightweight multi-platform, multi-architecture disassembly
@@ -61,7 +64,8 @@
 Package: python3-capstone
 Section: python
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libcapstone3
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python3:Depends}, libcapstone3,
+ python3-distutils
 XB-Python3-Version: ${python:Versions}
 Description: lightweight multi-architecture disassembly framework - Python bindings
  Capstone is a lightweight multi-platform, multi-architecture disassembly
diff -Nru capstone-3.0.4/debian/libcapstone3.dirs capstone-3.0.4/debian/libcapstone3.dirs
--- capstone-3.0.4/debian/libcapstone3.dirs	2016-09-02 22:45:39.000000000 +0000
+++ capstone-3.0.4/debian/libcapstone3.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-usr/lib
diff -Nru capstone-3.0.4/debian/libcapstone3.install capstone-3.0.4/debian/libcapstone3.install
--- capstone-3.0.4/debian/libcapstone3.install	2016-09-02 22:45:39.000000000 +0000
+++ capstone-3.0.4/debian/libcapstone3.install	2018-03-31 20:38:42.000000000 +0000
@@ -1 +1 @@
-usr/lib/lib*.so.*
+usr/lib/*-*/lib*.so.*
diff -Nru capstone-3.0.4/debian/libcapstone-dev.dirs capstone-3.0.4/debian/libcapstone-dev.dirs
--- capstone-3.0.4/debian/libcapstone-dev.dirs	2016-09-02 22:45:39.000000000 +0000
+++ capstone-3.0.4/debian/libcapstone-dev.dirs	1970-01-01 00:00:00.000000000 +0000
@@ -1,2 +0,0 @@
-usr/lib
-usr/include
diff -Nru capstone-3.0.4/debian/libcapstone-dev.install capstone-3.0.4/debian/libcapstone-dev.install
--- capstone-3.0.4/debian/libcapstone-dev.install	2016-09-02 22:45:39.000000000 +0000
+++ capstone-3.0.4/debian/libcapstone-dev.install	2018-03-31 20:38:25.000000000 +0000
@@ -1,4 +1,4 @@
 usr/include/*
-usr/lib/lib*.a
-usr/lib/lib*.so
-usr/lib/pkgconfig/*
+usr/lib/*-*/lib*.a
+usr/lib/*-*/lib*.so
+usr/lib/*-*/pkgconfig/*
diff -Nru capstone-3.0.4/debian/rules capstone-3.0.4/debian/rules
--- capstone-3.0.4/debian/rules	2017-07-30 12:26:50.000000000 +0000
+++ capstone-3.0.4/debian/rules	2018-03-31 20:56:56.000000000 +0000
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 
+include /usr/share/dpkg/architecture.mk
+
 %:
 	dh $@ --parallel --with python2,python3
 
@@ -9,7 +11,8 @@
 override_dh_auto_build \
 override_dh_auto_test \
 override_dh_auto_install:
-	$(patsubst override_%,%,$@)
+	$(patsubst override_%,%,$@) -- \
+		LIBDIRARCH=lib/$(DEB_HOST_MULTIARCH)
 	$(patsubst override_%,%,$@) --sourcedirectory=bindings/python --buildsystem=pybuild
 
 override_dh_auto_test: export LD_LIBRARY_PATH := $(LD_LIBRARY_PATH):$(CURDIR)