diff -Nru xcfa-5.0.2/debian/changelog xcfa-5.0.2/debian/changelog
--- xcfa-5.0.2/debian/changelog	2018-04-03 12:51:55.000000000 +0000
+++ xcfa-5.0.2/debian/changelog	2021-02-18 00:04:42.000000000 +0000
@@ -1,8 +1,18 @@
-xcfa (5.0.2-1build1) bionic; urgency=high
+xcfa (5.0.2-1.1build1) hirsute; urgency=medium
 
-  * No change rebuild to pick up -fPIE compiler default
+  * No change rebuild with fixed ownership.
 
- -- Balint Reczey <rbalint@ubuntu.com>  Tue, 03 Apr 2018 12:51:55 +0000
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Thu, 18 Feb 2021 00:04:42 +0000
+
+xcfa (5.0.2-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Build with -fcommon to workaround FTBFS with gcc 10.
+    (Closes: #957973)
+  * Depend on a version of icedax with a cdda2wav symlink.
+    (Closes: #940143)
+
+ -- Adrian Bunk <bunk@debian.org>  Fri, 05 Feb 2021 13:03:24 +0200
 
 xcfa (5.0.2-1) unstable; urgency=medium
 
diff -Nru xcfa-5.0.2/debian/control xcfa-5.0.2/debian/control
--- xcfa-5.0.2/debian/control	2018-04-03 12:51:55.000000000 +0000
+++ xcfa-5.0.2/debian/control	2021-02-18 00:04:42.000000000 +0000
@@ -22,7 +22,7 @@
 Architecture: any
 Depends:
  flac,
- icedax | cdparanoia,
+ icedax (>= 9:1.1.11-3.1) | cdparanoia,
  vorbis-tools,
  ${misc:Depends},
  ${shlibs:Depends}
diff -Nru xcfa-5.0.2/debian/rules xcfa-5.0.2/debian/rules
--- xcfa-5.0.2/debian/rules	2015-06-10 12:04:30.000000000 +0000
+++ xcfa-5.0.2/debian/rules	2021-02-05 11:03:24.000000000 +0000
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 export LDFLAGS+=-Wl,--as-needed
+export DEB_CPPFLAGS_MAINT_APPEND += -fcommon
 
 %:
 	dh $@ --parallel --with autotools_dev