diff -pruN 0.5-1/debian/changelog 0.5-2/debian/changelog
--- 0.5-1/debian/changelog	2021-11-16 18:25:55.000000000 +0000
+++ 0.5-2/debian/changelog	2022-08-04 10:43:57.000000000 +0000
@@ -1,3 +1,18 @@
+crust-firmware (0.5-2) unstable; urgency=medium
+
+  [ Jonas Smedegaard ]
+  * note Philip Rinn as tester in source
+
+  * Link with --no-warn-rwx-segments. Closes: #1015057
+  * watch: remove unneeded filenamemangle option
+  * upstream/metadata: basic information about upstream contacts
+  * generic_platforms.patch: not forwarded
+  * Standards-Version: 4.6.1
+  * fix lintian override for wrong-section-according-to-package-name
+  * Update copyright years
+
+ -- Nicolas Boulenguez <nicolas@debian.org>  Thu, 04 Aug 2022 12:43:57 +0200
+
 crust-firmware (0.5-1) unstable; urgency=medium
 
   [ upstream ]
diff -pruN 0.5-1/debian/control 0.5-2/debian/control
--- 0.5-1/debian/control	2021-09-06 19:11:42.000000000 +0000
+++ 0.5-2/debian/control	2022-08-04 10:41:59.000000000 +0000
@@ -5,7 +5,7 @@ Maintainer: Nicolas Boulenguez <nicolas@
 Uploaders:
  Jonas Smedegaard <dr@jones.dk>,
  Arnaud Ferraris <arnaud.ferraris@gmail.com>,
-Standards-Version: 4.6.0
+Standards-Version: 4.6.1
 Build-Depends:
  bison,
  debhelper-compat (= 13),
diff -pruN 0.5-1/debian/copyright 0.5-2/debian/copyright
--- 0.5-1/debian/copyright	2021-10-07 20:40:53.000000000 +0000
+++ 0.5-2/debian/copyright	2022-08-04 10:41:59.000000000 +0000
@@ -6,7 +6,7 @@ Source: https://github.com/crust-firmwar
 Files: *
 Copyright:
   2014-2017  ARM Limited and Contributors
-  2020-2021  Nicolas Boulenguez <nicolas@debian.org>
+  2020-2022  Nicolas Boulenguez <nicolas@debian.org>
   2005-2014  Rich Felker, et al.
   2017-2021  The Crust Firmware Authors
 License-Grant:
diff -pruN 0.5-1/debian/lintian-overrides 0.5-2/debian/lintian-overrides
--- 0.5-1/debian/lintian-overrides	2021-06-05 09:37:08.000000000 +0000
+++ 0.5-2/debian/lintian-overrides	2022-08-04 10:41:59.000000000 +0000
@@ -1,2 +1,2 @@
 # The firmware is intended for u-boot, not the Linux kernel.
-wrong-section-according-to-package-name crust-firmware => kernel
+wrong-section-according-to-package-name admin => kernel
diff -pruN 0.5-1/debian/patches/2001_generic_platforms.patch 0.5-2/debian/patches/2001_generic_platforms.patch
--- 0.5-1/debian/patches/2001_generic_platforms.patch	2021-11-15 11:19:38.000000000 +0000
+++ 0.5-2/debian/patches/2001_generic_platforms.patch	2022-08-04 10:41:59.000000000 +0000
@@ -1,4 +1,5 @@
 Description: add configs for generic platforms
+Forwarded: not-needed
 Author: Jonas Smedegaard <dr@jones.dk>
 Last-Update: 2021-11-15
 ---
diff -pruN 0.5-1/debian/patches/2002_no_warn_rwx_segments.patch 0.5-2/debian/patches/2002_no_warn_rwx_segments.patch
--- 0.5-1/debian/patches/2002_no_warn_rwx_segments.patch	1970-01-01 00:00:00.000000000 +0000
+++ 0.5-2/debian/patches/2002_no_warn_rwx_segments.patch	2022-08-04 10:17:36.000000000 +0000
@@ -0,0 +1,15 @@
+Description: Do not allow a warning to break the build
+Bug-Debian: https://bugs.debian.org/1015057
+Forwarded: https://github.com/crust-firmware/crust/issues/207
+Author: Nicolas Boulenguez <nicolas@debian.org>
+
+--- a/Makefile
++++ b/Makefile
+@@ -81,6 +81,7 @@
+ 		   -Wl,-O1 \
+ 		   -Wl,--build-id=none \
+ 		   -Wl,--fatal-warnings \
++		   -Wl,--no-warn-rwx-segments \
+ 		   -Wl,--gc-sections \
+ 		   -Wl,--no-dynamic-linker \
+ 		   -Wl,--no-undefined
diff -pruN 0.5-1/debian/patches/series 0.5-2/debian/patches/series
--- 0.5-1/debian/patches/series	2021-11-15 10:58:17.000000000 +0000
+++ 0.5-2/debian/patches/series	2022-08-04 10:12:05.000000000 +0000
@@ -1 +1,2 @@
 2001_generic_platforms.patch
+2002_no_warn_rwx_segments.patch
diff -pruN 0.5-1/debian/rules 0.5-2/debian/rules
--- 0.5-1/debian/rules	2021-11-16 18:01:04.000000000 +0000
+++ 0.5-2/debian/rules	2022-08-04 09:43:28.000000000 +0000
@@ -10,7 +10,7 @@ platforms = $(foreach p, a64 a64_axp20x
 platforms_like_generic_a64_axp20x_cec += a64-olinuxino
 
 # Jonas Smedegaard <dr@jones.dk>
-# maybe Philip Rinn <rinni@inventati.org>
+# Philip Rinn <rinni@inventati.org>
 platforms_like_generic_a64_axp20x_cec += a64-olinuxino-emmc
 
 # Sunil Mohan Adapa <sunil@medhas.org>
diff -pruN 0.5-1/debian/upstream/metadata 0.5-2/debian/upstream/metadata
--- 0.5-1/debian/upstream/metadata	1970-01-01 00:00:00.000000000 +0000
+++ 0.5-2/debian/upstream/metadata	2022-08-04 10:41:59.000000000 +0000
@@ -0,0 +1,3 @@
+Bug-Database: https://github.com/crust-firmware/crust/issues
+Repository: https://github.com/crust-firmware/crust
+Repository-Browse: https://github.com/crust-firmware/crust.git
diff -pruN 0.5-1/debian/watch 0.5-2/debian/watch
--- 0.5-1/debian/watch	2021-11-15 10:18:09.000000000 +0000
+++ 0.5-2/debian/watch	2022-08-04 10:41:59.000000000 +0000
@@ -3,7 +3,6 @@ version=4
 # update: gbp import-orig --upstream-vcs-tag=vX.Y.Z --uscan
 
 opts=\
-filenamemangle=s/.*?(@ANY_VERSION@@ARCHIVE_EXT@)/@PACKAGE@-$1/,\
 dversionmangle=auto \
 https://github.com/crust-firmware/crust/tags \
 .*?@ANY_VERSION@@ARCHIVE_EXT@
