diff -pruN 17/debian/changelog 17ubuntu1/debian/changelog
--- 17/debian/changelog	2022-08-10 15:50:39.000000000 +0000
+++ 17ubuntu1/debian/changelog	2022-10-03 13:34:41.000000000 +0000
@@ -1,3 +1,9 @@
+binutils-arm-none-eabi (17ubuntu1) kinetic; urgency=medium
+
+  * Fix version madness.
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 03 Oct 2022 15:34:41 +0200
+
 binutils-arm-none-eabi (17) unstable; urgency=medium
 
   * Make --no-warn-rwx-segments the default.
diff -pruN 17/debian/copyright 17ubuntu1/debian/copyright
--- 17/debian/copyright	2022-08-10 15:50:39.000000000 +0000
+++ 17ubuntu1/debian/copyright	2022-10-03 13:34:41.000000000 +0000
@@ -1,27 +1,3 @@
-The packaging files for binutils-arm-none-eabi are separate from the
-binutils source package and are Copyright © 2013 Keith Packard
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program; if not, write to the Free Software
-   Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston,
-   MA 02110-1301, USA.  */
-
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'.
-
-The source package for binutils is covered by the following copyright
-and license:
-
 This is the Debian GNU/Linux prepackaged version of the GNU assembler,
 linker, and binary utilities.
 
@@ -36,11 +12,9 @@ and:
 
 It was previously maintained by Christopher C. Chimelis <chris@debian.org>
 
-On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
-
 GNU Binutils is Copyright (C) 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997,
-1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software
+1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+2011, 2012, 2013, 2014, 2015, 2015, 2016, 2017, 2018, 2019 Free Software
 Foundation, Inc.
 
    This program is free software; you can redistribute it and/or modify
@@ -59,8 +33,8 @@ Foundation, Inc.
    MA 02110-1301, USA.  */
 
 On Debian GNU/Linux systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL-3'
-and `/usr/share/common-licenses/LGPL-3'.
+Public License can be found in `/usr/share/common-licenses/GPL'
+and `/usr/share/common-licenses/LGPL'.
 
 The binutils manuals and associated documentation are also Copyright
 (C) Free Software Foundation, Inc.  They are distributed under the GNU
diff -pruN 17/debian/rules 17ubuntu1/debian/rules
--- 17/debian/rules	2022-08-10 15:50:39.000000000 +0000
+++ 17ubuntu1/debian/rules	2022-10-03 13:34:41.000000000 +0000
@@ -13,7 +13,7 @@ stampdir=debian/stamp
 
 source_version := $(shell dpkg-query -W -f="\$${Version}\n" binutils-source)
 deb_version := $(source_version)+$(shell dpkg-parsechangelog | sed -ne "s/^Version: \(.*\)/\1/p")
-deb_upstream_version := $(shell echo $(deb_version) | cut -d. -f1-3)
+deb_upstream_version := $(shell echo $(deb_version) | sed 's/-.*$$//')
 
 upstream_dir=binutils-$(deb_upstream_version)
 
