diff --git a/debian/changelog b/debian/changelog
index 428e3ee..d63ad6b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,18 @@
+dwm (6.1-3) unstable; urgency=low
+
+  * debian/control:
+    - Bump Standards-Version to 3.9.8 (no changes needed).
+  * debian/rules:
+    - Make dwm repoducible by sorting header files before processing them
+      (acknowledgements to Reiner Herrmann for the patch) (Closes: #825545).
+  * debian/patches/2004_use_system_searchpaths.patch:
+    - Use HTTPS protocol in the BTS link.
+  * debian/copyright:
+    - Update Format field to match DEP5 recommandations.
+    - Use 'Expat' instead of 'MIT'.
+
+ -- Hugo Lefeuvre <hle@debian.org>  Sun, 19 Jun 2016 13:23:37 +0200
+
 dwm (6.1-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index 3cda997..69eae67 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,7 @@
                libxft-dev,
                libfreetype6-dev,
                dpkg-dev (>= 1.16.1.1)
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
 Homepage: http://dwm.suckless.org/
 Vcs-Git: https://anonscm.debian.org/git/collab-maint/dwm.git
 Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/dwm.git
diff --git a/debian/copyright b/debian/copyright
index ed37010..8e33c2e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: dwm
 Source: http://dwm.suckless.org
 
@@ -16,16 +16,16 @@
            © 2008 Martin Hurton <martin dot hurton at gmail dot com>
            © 2008 Neale Pickett <neale dot woozle dot org>
            © 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
-License: MIT
+License: Expat
 
 Files: debian/*
 Copyright: (C) 2015-2016 Hugo Lefeuvre <hle@debian.org>
            (C) 2011 Vasudev Kamath <kamathvasudev@gmail.com>
            (C) 2010 Kai Hendry <hendry@iki.fi>
            (C) 2006-2010 Daniel Baumann <daniel@debian.org>
-License: MIT
+License: Expat
 
-License: MIT
+License: Expat
  Permission is hereby granted, free of charge, to any person obtaining a
  copy of this software and associated documentation files (the "Software"),
  to deal in the Software without restriction, including without limitation
diff --git a/debian/patches/2004_use_system_searchpaths.patch b/debian/patches/2004_use_system_searchpaths.patch
index 7e16e4f..13c7cb6 100644
--- a/debian/patches/2004_use_system_searchpaths.patch
+++ b/debian/patches/2004_use_system_searchpaths.patch
@@ -6,7 +6,7 @@
  mips* it causes FTBFS. Thanks to YunQiang Su for bringing this up.
 Author: Vasudev Kamath <kamathvasudev@gmail.com>
 Last-Updated: 2016-03-26
-Bug-Debian: http://bugs.debian.org/722765
+Bug-Debian: https://bugs.debian.org/722765
 
 --- a/config.mk	2016-03-26 23:36:45.914814792 +0100
 +++ b/config.mk	2016-03-26 23:37:20.275092945 +0100
diff --git a/debian/rules b/debian/rules
index 0b3ac4d..ae9cd41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,5 +28,5 @@
 	done
 
 	# Configuring maintainer scripts
-	sed -e "s|@ALTERNATIVES@|$(shell find debian/local/ -name 'config.*.h' | cut -d'.' -f 2 | tr '\n' ' ')|" debian/dwm.postinst.in > debian/dwm.postinst
-	sed -e "s|@ALTERNATIVES@|$(shell find debian/local/ -name 'config.*.h' | cut -d'.' -f 2 | tr '\n' ' ')|" debian/dwm.prerm.in > debian/dwm.prerm
+	sed -e "s|@ALTERNATIVES@|$(shell find debian/local/ -name 'config.*.h' | LC_ALL=C sort | cut -d'.' -f 2 | tr '\n' ' ')|" debian/dwm.postinst.in > debian/dwm.postinst
+	sed -e "s|@ALTERNATIVES@|$(shell find debian/local/ -name 'config.*.h' | LC_ALL=C sort | cut -d'.' -f 2 | tr '\n' ' ')|" debian/dwm.prerm.in > debian/dwm.prerm