diff -Nru pth-2.0.7/debian/changelog pth-2.0.7/debian/changelog
--- pth-2.0.7/debian/changelog	2019-08-19 01:12:26.000000000 +0000
+++ pth-2.0.7/debian/changelog	2019-08-20 00:19:42.000000000 +0000
@@ -1,3 +1,11 @@
+pth (2.0.7-22) unstable; urgency=medium
+
+  * debian/watch: Fix the URL.
+  * debian/rules: Simplify.
+  * debian/source/options: Remove.
+
+ -- NIIBE Yutaka <gniibe@fsij.org>  Tue, 20 Aug 2019 09:19:42 +0900
+
 pth (2.0.7-21) unstable; urgency=medium
 
   [ NIIBE Yutaka ]
@@ -12,6 +20,7 @@
   * debian/copyright: Use https in URL.
   * debian/watch: Update with the site which supports https.
   * debian/source/options: New.
+  * debian/patches/05-linux_3.patch: Update for newer Linux kernel.
   * debian/patches/09-configure-ac.patch: New.  Merge 02-configure.patch.
   * debian/patches/10-Makefile-in.patch: New.
   * debian/patches/02-configure.patch: Remove.
diff -Nru pth-2.0.7/debian/patches/02-configure.patch pth-2.0.7/debian/patches/02-configure.patch
--- pth-2.0.7/debian/patches/02-configure.patch	2019-08-15 04:17:24.000000000 +0000
+++ pth-2.0.7/debian/patches/02-configure.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,24 +0,0 @@
-Description: patch to enable -g option for compiling
- Without this, pth-dbg package is not that useful
-Author: NIIBE Yutaka <gniibe@fsij.org>
-Forwarded: No
-Reviewed-By: NIIBE Yutaka <gniibe@fsij.org>
-Last_Update: 2010-05-12
-
---- pth-2.0.7.orig/configure	2006-06-09 03:14:48.000000000 +0900
-+++ pth-2.0.7/configure	2010-05-12 10:49:23.000000000 +0900
-@@ -3054,14 +3054,6 @@
-  ;;
- esac
- fi
--case "$CFLAGS" in
--    *-g* ) CFLAGS=`echo "$CFLAGS" |\
--                   sed -e 's/ -g / /g' -e 's/ -g$//' -e 's/^-g //g' -e 's/^-g$//'` ;;
--esac
--case "$CXXFLAGS" in
--    *-g* ) CXXFLAGS=`echo "$CXXFLAGS" |\
--                     sed -e 's/ -g / /g' -e 's/ -g$//' -e 's/^-g //g' -e 's/^-g$//'` ;;
--esac
- msg="disabled"
- 
- fi; echo "$as_me:$LINENO: checking for compilation debug mode" >&5
diff -Nru pth-2.0.7/debian/patches/08-powerpc64le.diff pth-2.0.7/debian/patches/08-powerpc64le.diff
--- pth-2.0.7/debian/patches/08-powerpc64le.diff	2019-08-15 04:17:26.000000000 +0000
+++ pth-2.0.7/debian/patches/08-powerpc64le.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,60 +0,0 @@
-Description: Support ppc64el
-Author: Erwan Prioul
-Last_Update: 2014-07-24
-
-Index: b/configure
-===================================================================
---- a/configure
-+++ b/configure
-@@ -4383,7 +4383,10 @@
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_i386"
-           ;;
--        ppc64-*linux*|powerpc64-*linux*)
-+	powerpc64le-*)
-+	  LD="${LD-ld} -m elf32lppclinux"
-+	  ;;
-+	powerpc64-*)
-           LD="${LD-ld} -m elf32ppclinux"
-           ;;
-         s390x-*linux*)
-@@ -4399,7 +4402,10 @@
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_x86_64"
-           ;;
--        ppc*-*linux*|powerpc*-*linux*)
-+	powerpcle-*)
-+	  LD="${LD-ld} -m elf64lppc"
-+	  ;;
-+	powerpc-*)
-           LD="${LD-ld} -m elf64ppc"
-           ;;
-         s390*-*linux*)
-Index: b/libtool.m4
-===================================================================
---- a/libtool.m4
-+++ b/libtool.m4
-@@ -533,7 +533,10 @@
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_i386"
-           ;;
--        ppc64-*linux*|powerpc64-*linux*)
-+	powerpc64le-*)
-+	  LD="${LD-ld} -m elf32lppclinux"
-+	  ;;
-+	powerpc64-*)
-           LD="${LD-ld} -m elf32ppclinux"
-           ;;
-         s390x-*linux*)
-@@ -549,7 +552,10 @@
-         x86_64-*linux*)
-           LD="${LD-ld} -m elf_x86_64"
-           ;;
--        ppc*-*linux*|powerpc*-*linux*)
-+	powerpcle-*)
-+	  LD="${LD-ld} -m elf64lppc"
-+	  ;;
-+	powerpc-*)
-           LD="${LD-ld} -m elf64ppc"
-           ;;
-         s390*-*linux*)
diff -Nru pth-2.0.7/debian/patches/series pth-2.0.7/debian/patches/series
--- pth-2.0.7/debian/patches/series	2019-08-19 01:08:10.000000000 +0000
+++ pth-2.0.7/debian/patches/series	2019-08-20 00:19:42.000000000 +0000
@@ -1,11 +1,9 @@
 01-ia64.patch
-# 02-configure.patch
 03-hurd-pth_mctx.patch
 04-exit_on_failed_test.patch
 05-linux_3.patch
 06-ldflags.patch
 07-test_uctx_fix.patch
-# 08-powerpc64le.diff
 09-configure-ac.patch
 10-Makefile-in.patch
 11-autoconf-macros.patch
diff -Nru pth-2.0.7/debian/rules pth-2.0.7/debian/rules
--- pth-2.0.7/debian/rules	2019-08-16 08:09:49.000000000 +0000
+++ pth-2.0.7/debian/rules	2019-08-20 00:10:43.000000000 +0000
@@ -14,11 +14,10 @@
 
 override_dh_autoreconf_clean:
 	dh_autoreconf_clean
-	rm -f acinclude.m4
 	rm -rf m4
+	if test -f acinclude.m4; then mv acinclude.m4 aclocal.m4; fi
 
 override_dh_autoreconf:
 	mv aclocal.m4 acinclude.m4
 	mkdir -p m4
-	libtoolize --copy --force
-	dh_autoreconf --as-needed autoreconf -- -f -i -I m4
+	dh_autoreconf
diff -Nru pth-2.0.7/debian/source/options pth-2.0.7/debian/source/options
--- pth-2.0.7/debian/source/options	2019-08-16 08:02:44.000000000 +0000
+++ pth-2.0.7/debian/source/options	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-extend-diff-ignore = "(^|/)(aclocal.m4)$"
diff -Nru pth-2.0.7/debian/watch pth-2.0.7/debian/watch
--- pth-2.0.7/debian/watch	2019-08-16 04:42:03.000000000 +0000
+++ pth-2.0.7/debian/watch	2019-08-20 00:03:00.000000000 +0000
@@ -1,2 +1,2 @@
 version=3
-https://ftp.gnu.org/pth/ pth-(\d.*)\.tar\.gz
+https://ftp.gnu.org/gnu/pth/ pth-(\d.*)\.tar\.gz