diff --git a/debian/changelog b/debian/changelog
index 5a2a8ae..27f3df5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,20 @@
+vpcs (0.5b2-2.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Fix ftbfs with GCC-10. (Closes: #957920)
+
+ -- Sudip Mukherjee <sudipm.mukherjee@gmail.com> Sun, 06 Sep 2020 20:00:57 +0100
+
+vpcs (0.5b2-2.1) unstable; urgency=medium
+
+ [ Daniel Lintott ]
+ * Update debian/watch.
+
+ [ Andrej Shadura ]
+ * Don’t needlessly include the current directory (Closes: #887694).
+
+ -- Andrej Shadura <andrewsh@debian.org> Sat, 23 Jun 2018 15:14:38 +0200
+
vpcs (0.5b2-1) unstable; urgency=medium
* Imported Upstream version 0.5b2
diff --git a/debian/patches/gcc-10.patch b/debian/patches/gcc-10.patch
new file mode 100644
index 0000000..29e22b7
--- /dev/null
+++ b/debian/patches/gcc-10.patch
@@ -0,0 +1,29 @@
+Description: Fix ftbfs with GCC-10
+
+Author: Sudip Mukherjee <sudipm.mukherjee@gmail.com>
+Bug-Debian: https://bugs.debian.org/957920
+Forwarded: no
+
+---
+
+--- vpcs-0.5b2.orig/src/command6.c
++++ vpcs-0.5b2/src/command6.c
+@@ -50,6 +50,7 @@ extern u_int time_tick;
+ extern int num_pths;
+
+ int run_net6(char *cmdstr);
++pcs vpc[MAX_NUM_PTHS];
+
+ #include "inet6.h"
+ extern int vinet_pton6(int af, const char * __restrict src, void * __restrict dst);
+--- vpcs-0.5b2.orig/src/vpcs.h
++++ vpcs-0.5b2/src/vpcs.h
+@@ -114,7 +114,7 @@ typedef struct {
+ hipv6 link6;
+ } pcs;
+
+-pcs vpc[MAX_NUM_PTHS];
++extern pcs vpc[MAX_NUM_PTHS];
+
+ #define delay_ms(s) usleep(s * 1000)
+
diff --git a/debian/patches/series b/debian/patches/series
index 21a7cbd..39e8af4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ hyphen-used-as-minus.patch
LinuxMakefilePatch
CreateTopLevelMakefile
hurd_path_max
+gcc-10.patch
diff --git a/debian/rules b/debian/rules
index bc09966..267cb27 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,12 +7,12 @@
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
ifeq ($(DEB_HOST_ARCH_OS),hurd)
-export DEB_CFLAGS_MAINT_APPEND = -DLinux -Wall -I. -I/usr/share/libdde_linux26/build/include/linux-headers -DHV -Wno-strict-aliasing
+export DEB_CFLAGS_MAINT_APPEND = -DLinux -Wall -I/usr/share/libdde_linux26/build/include/linux-headers -DHV -Wno-strict-aliasing
else
ifeq ($(DEB_HOST_ARCH_OS),kfreebsd)
-export DEB_CFLAGS_MAINT_APPEND = -DGNUkFreeBSD -DFreeBSD -Wall -I. -DHV -Wno-strict-aliasing
+export DEB_CFLAGS_MAINT_APPEND = -DGNUkFreeBSD -DFreeBSD -Wall -DHV -Wno-strict-aliasing
else
-export DEB_CFLAGS_MAINT_APPEND = -DLinux -Wall -I. -DTAP -DHV -Wno-strict-aliasing
+export DEB_CFLAGS_MAINT_APPEND = -DLinux -Wall -DTAP -DHV -Wno-strict-aliasing
endif
endif
