diff -Nru libpsl-0.21.0/debian/changelog libpsl-0.21.0/debian/changelog
--- libpsl-0.21.0/debian/changelog	2020-05-16 14:24:03.000000000 +0000
+++ libpsl-0.21.0/debian/changelog	2020-10-12 15:30:37.000000000 +0000
@@ -1,3 +1,11 @@
+libpsl (0.21.0-1.1ubuntu1) groovy; urgency=medium
+
+  * d/p/0008-Update-Platform.sh-example-in-test-data.patch: cherry-pick
+    upstream 0.21.1 fix for the test-is-public-builtin test, updating the test
+    data accordingly. Fixes FTBFS.
+
+ -- Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com>  Mon, 12 Oct 2020 17:30:37 +0200
+
 libpsl (0.21.0-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru libpsl-0.21.0/debian/control libpsl-0.21.0/debian/control
--- libpsl-0.21.0/debian/control	2020-05-16 14:24:03.000000000 +0000
+++ libpsl-0.21.0/debian/control	2020-10-12 15:30:37.000000000 +0000
@@ -1,6 +1,7 @@
 Source: libpsl
 Priority: optional
-Maintainer: Tim Rühsen <tim.ruehsen@gmx.de>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Tim Rühsen <tim.ruehsen@gmx.de>
 Uploaders:
  Daniel Kahn Gillmor <dkg@fifthhorseman.net>,
 Build-Depends:
diff -Nru libpsl-0.21.0/debian/patches/0008-Update-Platform.sh-example-in-test-data.patch libpsl-0.21.0/debian/patches/0008-Update-Platform.sh-example-in-test-data.patch
--- libpsl-0.21.0/debian/patches/0008-Update-Platform.sh-example-in-test-data.patch	1970-01-01 00:00:00.000000000 +0000
+++ libpsl-0.21.0/debian/patches/0008-Update-Platform.sh-example-in-test-data.patch	2020-10-12 15:29:53.000000000 +0000
@@ -0,0 +1,24 @@
+From f364cea73e351ce62e0b337fd1fbc21e70b52d56 Mon Sep 17 00:00:00 2001
+From: Nikola Kotur <nikola@platform.sh>
+Date: Thu, 2 Jul 2020 16:41:58 +0200
+Subject: [PATCH] Update Platform.sh example in test data
+
+---
+ tests/test-is-public-builtin.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test-is-public-builtin.c b/tests/test-is-public-builtin.c
+index e9963b5..ea3a434 100644
+--- a/tests/test-is-public-builtin.c
++++ b/tests/test-is-public-builtin.c
+@@ -82,8 +82,8 @@ static void test_psl(void)
+ 		{ ".forgot.his.name", 1, 1 },
+ 		{ "whoever.his.name", 0, 0 },
+ 		{ "whoever.forgot.his.name", 0, 0 },
+-		{ "whatever.platform.sh", 1, 1 },
+-		{ ".platform.sh", 1, 1 },
++		{ "whatever.platformsh.site", 1, 1 },
++		{ ".platformsh.site", 1, 1 },
+ 		{ "whatever.yokohama.jp", 1, 1 },
+ 		{ ".yokohama.jp", 1, 1 },
+ 		{ ".", 1, 0 }, /* special case */
diff -Nru libpsl-0.21.0/debian/patches/series libpsl-0.21.0/debian/patches/series
--- libpsl-0.21.0/debian/patches/series	2020-03-04 17:39:16.000000000 +0000
+++ libpsl-0.21.0/debian/patches/series	2020-10-12 15:30:16.000000000 +0000
@@ -5,3 +5,4 @@
 0005-Add-missing-api-indeces-for-gtk-doc.patch
 0006-Use-NULL-and-FILE-overall-in-gtk-docs.patch
 0007-gtk-doc-do-not-include-tree_index.sgml.patch
+0008-Update-Platform.sh-example-in-test-data.patch