diff --git a/debian/changelog b/debian/changelog
index f0bfe45..61b9589 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+lives (3.0.2-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Add FTBFS_rpc.h.patch to fix FTBFS due to redundant line, thanks to
+ upstream (salsaman) (Closes: #997240)
+
+ -- Florian Ernst <florian@debian.org> Sat, 02 Apr 2022 17:49:25 +0200
+
+lives (3.0.2-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build with -fcommon to workaround FTBFS with gcc 10.
+ (Closes: #957495)
+
+ -- Adrian Bunk <bunk@debian.org> Sun, 07 Feb 2021 09:13:26 +0200
+
lives (3.0.2-1) unstable; urgency=medium
* Team upload.
diff --git a/debian/patches/FTBFS_rpc.h.patch b/debian/patches/FTBFS_rpc.h.patch
new file mode 100644
index 0000000..bb8987f
--- /dev/null
+++ b/debian/patches/FTBFS_rpc.h.patch
@@ -0,0 +1,17 @@
+Description: Fix FTBFS due to redundant line
+Author: Florian Ernst <florian@debian.org>
+Origin: upstream, https://github.com/salsaman/LiVES/commit/5b47c02bc0e1f6b5ade1eac328e5312da18ac1da
+Bug-Debian: https://bugs.debian.org/997240
+Forwarded: not-needed
+Last-Update: 2022-04-02
+
+--- lives-3.0.2.orig/libOSC/sendOSC/htmsocket.c
++++ lives-3.0.2/libOSC/sendOSC/htmsocket.c
+@@ -38,7 +38,6 @@ Adrian Freed
+ #include <netinet/in.h>
+ #include <sys/time.h>
+
+-#include <rpc/rpc.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+ #include <sys/times.h>
diff --git a/debian/patches/series b/debian/patches/series
index d63c229..e42ae39 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
02-drop_py3_multiencoder.patch
parallel-build.patch
04-underlinking.patch
+FTBFS_rpc.h.patch
diff --git a/debian/rules b/debian/rules
index 2f9b818..ffada41 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,8 @@
include /usr/share/dpkg/architecture.mk
include /usr/share/dpkg/pkg-info.mk
+export DEB_CFLAGS_MAINT_APPEND = -fcommon
+
%:
dh $@ --with=python3
