diff --git a/.gitignore b/.gitignore
index d8f42df..5c841e8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-SOURCES/kronosnet-1.18.tar.gz
+SOURCES/kronosnet-1.22.tar.gz
diff --git a/.kronosnet.metadata b/.kronosnet.metadata
index ed4fd77..738effa 100644
--- a/.kronosnet.metadata
+++ b/.kronosnet.metadata
@@ -1 +1 @@
-d39ff105a8cfb8aa7b03b4b56ed55cf41dcb5ef4 SOURCES/kronosnet-1.18.tar.gz
+00f8110dfa4ec8d07511d48017d75441516c3b4b SOURCES/kronosnet-1.22.tar.gz
diff --git a/SPECS/kronosnet.spec b/SPECS/kronosnet.spec
index 4d3e2e8..864f339 100644
--- a/SPECS/kronosnet.spec
+++ b/SPECS/kronosnet.spec
@@ -1,7 +1,7 @@
 ###############################################################################
 ###############################################################################
 ##
-##  Copyright (C) 2012-2020 Red Hat, Inc.  All rights reserved.
+##  Copyright (C) 2012-2021 Red Hat, Inc.  All rights reserved.
 ##
 ##  This copyrighted material is made available to anyone wishing to use,
 ##  modify, copy, or redistribute it subject to the terms and conditions
@@ -82,12 +82,11 @@
 
 Name: kronosnet
 Summary: Multipoint-to-Multipoint VPN daemon
-Version: 1.18
-Release: 4%{?dist}
+Version: 1.22
+Release: 1%{?dist}
 License: GPLv2+ and LGPLv2+
 URL: http://www.kronosnet.org
 Source0: http://www.kronosnet.org/releases/kronosnet-%{version}.tar.gz
-#Patch0: bz2008196-calculate-defrag-buffers-correctly.patch
 
 # Build dependencies
 BuildRequires: gcc
@@ -136,7 +135,6 @@ BuildRequires: autoconf
 
 %prep
 %setup -q -n %{name}-%{version}
-#%patch0 -p1 -b .bz2008196-calculate-defrag-buffers-correctly
 
 %build
 %if %{defined buildautogen}
@@ -527,19 +525,11 @@ Requires: libnozzle1%{_isa} = %{version}-%{release}
 %endif
 
 %changelog
-* Wed Nov 17 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.18-4
-  Revert defrag buffer change
-  Resolves: rhbz#2023847
+* Thu Sep 16 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.22-1
+  Rebase to 1.22
+  Resolves: rhbz#1999976
 
-* Thu Nov 11 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.18-3
-  Rebuild to, hopefully, fix tag error
-  Resolves: rhbz#2008196
-
-* Wed Sep 29 2021 Christine Caulfield <ccaulfie@redhat.com> - 1.18-3
-  Calculate defrag buffers correctly
-  Resolves: rhbz#2008196
-
-* Wed Sep 23 2020 Christine Caulfield <ccaulfie@redhat.com> - 1.18-1
+  * Wed Sep 23 2020 Christine Caulfield <ccaulfie@redhat.com> - 1.18-1
   Rebase to 1.18
   Resolves: rhbz#1855301