diff --git a/archlinux/PKGBUILD b/archlinux/PKGBUILD
index 5cc6181..1fffe3b 100644
--- a/archlinux/PKGBUILD
+++ b/archlinux/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Boian Bonev <bbonev@ipacct.com>
 
 pkgname=iotop-c
-pkgver=1.20
+pkgver=1.21
 pkgrel=1
 pkgdesc="simple top-like I/O monitor (implemented in C)"
 arch=('any')
diff --git a/debian/changelog b/debian/changelog
index 5bac54f..1c1ebe7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+iotop-c (1.21~pre3-1) unstable; urgency=medium
+
+  * Update to new upstream release of 1.21
+    - Better support for disabled task_delayacct sysctl
+    - Add history and graph for all data
+    - Restore simple inline help
+  * Remove filenamemangle from d/watch
+
+ -- Boian Bonev <bbonev@ipacct.com>  Wed, 26 Jan 2022 15:20:46 +0000
+
 iotop-c (1.20-1) unstable; urgency=medium
 
   * Update to new upstream release of 1.20
diff --git a/debian/copyright b/debian/copyright
index 7deeed7..e4dd8aa 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,11 +5,11 @@ Source: https://github.com/Tomas-M/iotop
 
 Files: *
 Copyright: 2014 Vyacheslav Trushkin
-           2020,2021 Boian Bonev <bbonev@ipacct.com>
+           2020-2022 Boian Bonev <bbonev@ipacct.com>
 License: GPL-2.0+
 
 Files: debian/*
-Copyright: 2020,2021 Boian Bonev <bbonev@ipacct.com>
+Copyright: 2020-2022 Boian Bonev <bbonev@ipacct.com>
 License: GPL-2.0+
 
 License: GPL-2.0+
diff --git a/debian/watch b/debian/watch
index 9a202b5..edcfca0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,7 +1,7 @@
 version=4
 
 opts=\
-	"filenamemangle=s%(?:.*?)?iotop-?(\d[\d.]*)\.tar\.xz%iotop-c_$1.orig.tar.xz%,pgpsigurlmangle=s/releases\/download\/v([0-9.]+)\/iotop-([0-9.]+)\.tar\.xz/releases\/download\/v$1\/iotop-$1\.tar\.xz\.asc/" \
+	"pgpsigurlmangle=s/releases\/download\/v([0-9.]+)\/iotop-([0-9.]+)\.tar\.xz/releases\/download\/v$1\/iotop-$1\.tar\.xz\.asc/" \
 	https://github.com/Tomas-M/iotop/releases \
 	(?:.*?/)?iotop-?(\d[\d.]*)\.tar\.xz \
 	debian uupdate
diff --git a/fedora/iotop-c.spec b/fedora/iotop-c.spec
index 4d73da8..d351f64 100644
--- a/fedora/iotop-c.spec
+++ b/fedora/iotop-c.spec
@@ -1,5 +1,5 @@
 Name:           iotop-c
-Version:        1.20
+Version:        1.21
 Release:        1%{?dist}
 Summary:        Simple top-like I/O monitor (implemented in C)
 
@@ -52,7 +52,13 @@ mv %{buildroot}%{_mandir}/man8/iotop.8 %{buildroot}%{_mandir}/man8/iotop-c.8
 %{_mandir}/man8/iotop-c.8*
 
 %changelog
-* Mon Sep 04 2021 Boian Bonev <bbonev@ipacct.com> - 1.20-1
+* Wed Jan 26 2022 Boian Bonev <bbonev@ipacct.com> - 1.21-1
+- Update to latest ver 1.21
+
+* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 1.20-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Oct 04 2021 Boian Bonev <bbonev@ipacct.com> - 1.20-1
 - Update to latest ver 1.20
 
 * Tue Sep 21 2021 Boian Bonev <bbonev@ipacct.com> - 1.19-1
diff --git a/src/iotop.h b/src/iotop.h
index da13422..0ee2344 100644
--- a/src/iotop.h
+++ b/src/iotop.h
@@ -27,7 +27,7 @@ You should have received a copy of the GNU General Public License along with thi
 #include <sys/types.h>
 #include <stdint.h>
 
-#define VERSION "1.21~pre3"
+#define VERSION "1.21"
 
 typedef enum {
 	E_GR_IO,