diff -pruN 17/debian/changelog 18/debian/changelog
--- 17/debian/changelog	2022-08-10 15:50:39.000000000 +0000
+++ 18/debian/changelog	2022-10-23 23:22:17.000000000 +0000
@@ -1,3 +1,9 @@
+binutils-arm-none-eabi (18) unstable; urgency=medium
+
+  * Use dpkg-query's source:Upstream-Version instead of cut.
+
+ -- Keith Packard <keithp@keithp.com>  Sun, 23 Oct 2022 16:22:17 -0700
+
 binutils-arm-none-eabi (17) unstable; urgency=medium
 
   * Make --no-warn-rwx-segments the default.
diff -pruN 17/debian/control 18/debian/control
--- 17/debian/control	2022-08-10 15:50:39.000000000 +0000
+++ 18/debian/control	2022-10-23 23:22:17.000000000 +0000
@@ -18,7 +18,7 @@ Build-Depends:
  xz-utils,
  lsb-release,
  zlib1g-dev,
-Standards-Version: 4.6.0.1
+Standards-Version: 4.6.1.0
 Rules-Requires-Root: no
 Homepage: https://sourceware.org/binutils/
 Vcs-Git: https://salsa.debian.org/debian/binutils-arm-none-eabi.git
diff -pruN 17/debian/rules 18/debian/rules
--- 17/debian/rules	2022-08-10 15:50:39.000000000 +0000
+++ 18/debian/rules	2022-10-23 23:22:17.000000000 +0000
@@ -11,11 +11,13 @@ top_dir=$(shell pwd)
 binutils_dir=/usr/src/binutils
 stampdir=debian/stamp
 
+include /usr/share/dpkg/pkg-info.mk
+
 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)
+upstream_version := $(shell dpkg-query -W -f="\$${source:Upstream-Version}\n" binutils-source)
+deb_version := $(source_version)+$(DEB_VERSION)
 
-upstream_dir=binutils-$(deb_upstream_version)
+upstream_dir=binutils-$(upstream_version)
 
 untar_stamp=$(stampdir)/tar
 
@@ -54,7 +56,7 @@ override_dh_auto_configure: $(untar_stam
 	dh_auto_configure -D$(upstream_dir) -Bbuild -- $(configure_flags)
 
 override_dh_gencontrol:
-	dh_gencontrol -a -- -v$(deb_version) -Vlocal:Version=$(deb_upstream_version) -Vbinutils:Version=$(source_version) -VBuilt-Using="$(BUILT_USING)"
+	dh_gencontrol -a -- -v$(deb_version) -Vlocal:Version=$(upstream_version) -Vbinutils:Version=$(source_version) -VBuilt-Using="$(BUILT_USING)"
 
 override_dh_auto_clean:
 	rm -rf $(upstream_dir) build $(stampdir)