diff --git a/.gitignore b/.gitignore
index 2c22519..e0ba27f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ tcsh-6.17.00.tar.gz
 /tcsh-6.19.00.tar.gz
 /tcsh-6.20.00.tar.gz
 /tcsh-6.21.00.tar.gz
+/tcsh-TCSH6_22_00.tar.gz
+/tcsh-6.22.00.tar.gz
diff --git a/sources b/sources
index 14c690d..aab8ac9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (tcsh-6.21.00.tar.gz) = d7f46588a35b9cd01cfa33d0f9bbae09e9692605b5c045c2b58e66dba958ab904ddfe45aa7361767034e6cc03a34ad9ba4d14fa836df723bade29f3f6a18a46c
+SHA512 (tcsh-6.22.00.tar.gz) = 533d61a4870fcbf759a07347578a20557865a2bc363c971210bd86f17439c3188352a502cfd09f0b134d41ec9df5c174d017f15fe3a54c63ab35034b9cf2ccaf
diff --git a/tcsh-6.21.00-000-failing-exit-command-causes-infinite-loop.patch b/tcsh-6.21.00-000-failing-exit-command-causes-infinite-loop.patch
deleted file mode 100644
index 94419e9..0000000
--- a/tcsh-6.21.00-000-failing-exit-command-causes-infinite-loop.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff --git a/sh.c b/sh.c
-index 4b5c624..dd87172 100644
---- a/sh.c
-+++ b/sh.c
-@@ -237,6 +237,7 @@ main(int argc, char **argv)
-     int nofile = 0;
-     volatile int nverbose = 0;
-     volatile int rdirs = 0;
-+    volatile int exitcode = 0;
-     int quitit = 0;
-     Char *cp;
- #ifdef AUTOLOGOUT
-@@ -1390,6 +1391,12 @@ main(int argc, char **argv)
-     
- 
-     if (targinp) {
-+	/* If this -c command caused an error before, skip processing */
-+	if (reenter && arginp) {
-+	    exitcode = 1;
-+	    goto done;
-+	}
-+
- 	arginp = SAVE(targinp);
- 	/*
- 	 * we put the command into a variable
-@@ -1422,6 +1429,7 @@ main(int argc, char **argv)
-      */
-     process(setintr);
- 
-+done:
-     /*
-      * Mop-up.
-      */
-@@ -1443,7 +1451,7 @@ main(int argc, char **argv)
-     }
-     record();
-     exitstat();
--    return (0);
-+    return exitcode;
- }
- 
- void
diff --git a/tcsh.spec b/tcsh.spec
index 64b6705..53c1db1 100644
--- a/tcsh.spec
+++ b/tcsh.spec
@@ -12,8 +12,8 @@
 
 Name:             tcsh
 Summary:          An enhanced version of csh, the C shell
-Version:          6.21.00
-Release:          3%{?dist}
+Version:          6.22.00
+Release:          1%{?dist}
 License:          BSD
 
 URL:              http://www.tcsh.org/
@@ -42,7 +42,6 @@ BuildRequires:    ncurses-devel
 
 # Upstream patches -- official upstream patches released by upstream since the
 # ----------------    last rebase that are necessary for any reason:
-Patch000: tcsh-6.21.00-000-failing-exit-command-causes-infinite-loop.patch
 
 # Downstream patches -- these should be always included when doing rebase:
 # ------------------
@@ -176,6 +175,10 @@ fi
 # =============================================================================
 
 %changelog
+* Fri Nov 29 2019 Jan Macku <jamacku@redhat.com> - 6.22.00-1
+- Update to tcsh-6.22.00
+- Drop tcsh-6.21.00-000-failing-exit-command-causes-infinite-loop.patch     - applied by upstream
+
 * Fri Oct 25 2019 Jan Macku <jamacku@redhat.com> - 6.21.00-3
 - Added upstream patch to fix infinite loop caused by exit command