diff -Nru klibc-2.0.8/debian/changelog klibc-2.0.8/debian/changelog
--- klibc-2.0.8/debian/changelog	2020-08-28 16:41:47.000000000 +0000
+++ klibc-2.0.8/debian/changelog	2020-11-02 12:12:53.000000000 +0000
@@ -1,3 +1,10 @@
+klibc (2.0.8-5ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Keep Ubuntu specific debian/patches/cf-protection.patch
+
+ -- Matthias Klose <doko@ubuntu.com>  Mon, 02 Nov 2020 13:12:53 +0100
+
 klibc (2.0.8-5) experimental; urgency=medium
 
   * alpha: Fix definitions of _NSIG and struct sigaction
@@ -30,6 +37,19 @@
 
  -- Ben Hutchings <benh@debian.org>  Sat, 22 Aug 2020 21:35:52 +0100
 
+klibc (2.0.8-1ubuntu1) hirsute; urgency=medium
+
+  * Merge with Debian unstable (LP: #1900124). Remaining changes:
+    - Keep Ubuntu specific debian/patches/cf-protection.patch
+  * Dropped changes (fixed in 2.0.8-1):
+    - klibc-fstype-drop-obsolete-support-for-ext4dev.patch
+    - loop-header.patch
+    - loop-fixes.patch
+    - loop-fixes2.patch
+    - gcc10-fcommon.patch
+
+ -- Lukas Märdian <lukas.maerdian@canonical.com>  Mon, 26 Oct 2020 15:06:24 +0100
+
 klibc (2.0.8-1) unstable; urgency=medium
 
   [ Ben Hutchings ]
diff -Nru klibc-2.0.8/debian/control klibc-2.0.8/debian/control
--- klibc-2.0.8/debian/control	2020-08-21 00:12:27.000000000 +0000
+++ klibc-2.0.8/debian/control	2020-11-02 12:12:53.000000000 +0000
@@ -1,6 +1,7 @@
 Source: klibc
 Priority: optional
-Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Kernel Team <debian-kernel@lists.debian.org>
 Uploaders: Ben Hutchings <benh@debian.org>, maximilian attems <maks@debian.org>
 Build-Depends: debhelper-compat (= 12), linux-libc-dev, m4 [sparc]
 # klcc will depend on ccache if it was installed at build time; see #777217
diff -Nru klibc-2.0.8/debian/patches/cf-protection.patch klibc-2.0.8/debian/patches/cf-protection.patch
--- klibc-2.0.8/debian/patches/cf-protection.patch	1970-01-01 00:00:00.000000000 +0000
+++ klibc-2.0.8/debian/patches/cf-protection.patch	2020-11-02 12:12:53.000000000 +0000
@@ -0,0 +1,16 @@
+Description: Disable cf-protection for the syscall stubs to fix FTBFS
+Author: Adam Conrad <adconrad@ubuntu.com>
+Last-Update: 2020-10-26
+Forwarded: not-needed, different default compiler flags
+
+--- klibc-2.0.6.orig/usr/klibc/syscalls/Kbuild
++++ klibc-2.0.6/usr/klibc/syscalls/Kbuild
+@@ -28,7 +28,7 @@ clean-files += $(KLIBCINC)/klibc/havesys
+ # All the syscall stubs
+ clean-files += *.o *.S *.c *.list *.bin
+ 
+-EXTRA_KLIBCCFLAGS := -I$(srctree)/$(src)
++EXTRA_KLIBCCFLAGS := -fcf-protection=none -I$(srctree)/$(src)
+ 
+ quiet_cmd_makelist = LIST    $@
+       cmd_makelist = echo '$(filter-out FORCE,$^)' > $@
diff -Nru klibc-2.0.8/debian/patches/series klibc-2.0.8/debian/patches/series
--- klibc-2.0.8/debian/patches/series	2020-08-28 16:41:47.000000000 +0000
+++ klibc-2.0.8/debian/patches/series	2020-11-02 12:12:53.000000000 +0000
@@ -5,3 +5,4 @@
 0004-klibc-alpha-Pass-restorer-to-rt_sigaction-and-disabl.patch
 0005-klibc-sparc-Set-sa_restorer-for-signals-and-disable-.patch
 0001-klibc-ia64-Fix-definition-of-struct-sigaction.patch
+cf-protection.patch