diff --git a/gettext-0.21.1-disable-libtextstyle.patch b/gettext-0.22-disable-libtextstyle.patch
similarity index 71%
rename from gettext-0.21.1-disable-libtextstyle.patch
rename to gettext-0.22-disable-libtextstyle.patch
index cb70687..993163e 100644
--- a/gettext-0.21.1-disable-libtextstyle.patch
+++ b/gettext-0.22-disable-libtextstyle.patch
@@ -1,7 +1,6 @@
-diff --git a/Makefile.am b/Makefile.am
-index 5a7184c..28267a5 100644
---- a/Makefile.am
-+++ b/Makefile.am
+diff -ur gettext-0.22.orig/Makefile.am gettext-0.22/Makefile.am
+--- gettext-0.22.orig/Makefile.am	2023-06-23 17:44:45.388281215 +0800
++++ gettext-0.22/Makefile.am	2023-06-23 17:43:14.098701787 +0800
 @@ -19,7 +19,7 @@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
  ACLOCAL_AMFLAGS = -I m4
@@ -11,19 +10,19 @@ index 5a7184c..28267a5 100644
  
  changelog_etc = \
    gettext-runtime/ChangeLog.0 \
-@@ -124,7 +124,6 @@ distcheck-hook:
- 	test "`sed 1,16d $(srcdir)/gettext-runtime/intl/xsize.h | md5sum`" = "`sed 1,16d $(srcdir)/gettext-tools/gnulib-lib/xsize.h | md5sum`"
+@@ -87,7 +87,7 @@
+ 	cmp -s $(srcdir)/gettext-runtime/m4/xsize.m4 $(srcdir)/gettext-tools/gnulib-m4/xsize.m4
  	cmp -s $(srcdir)/gettext-runtime/man/help2man $(srcdir)/gettext-tools/man/help2man
  	cmp -s $(srcdir)/gettext-runtime/man/x-to-1.in $(srcdir)/gettext-tools/man/x-to-1.in
 -	cmp -s $(srcdir)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4
++#	cmp -s $(srcdir)/libtextstyle/m4/libtextstyle.m4 $(srcdir)/gettext-tools/gnulib-m4/libtextstyle.m4
  	cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.java $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.java
  	cmp -s $(srcdir)/gettext-tools/examples/hello-java-awt/m4/TestAWT.class $(srcdir)/gettext-tools/examples/hello-java-swing/m4/TestAWT.class
- 	test "`sed 1,15d $(srcdir)/gnulib-local/lib/alloca.in.h | md5sum`" = "`sed 1,15d $(srcdir)/gettext-runtime/libasprintf/alloca.in.h | md5sum`"
-diff --git a/configure.ac b/configure.ac
-index f4e54ea..ff850ae 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -37,7 +37,7 @@ dnl Checks for typedefs, structures, and compiler characteristics.
+ # Verify that all files have appropriate copyright headers.
+diff -ur gettext-0.22.orig/configure.ac gettext-0.22/configure.ac
+--- gettext-0.22.orig/configure.ac	2020-09-06 18:01:37.000000000 +0800
++++ gettext-0.22/configure.ac	2023-06-23 17:43:14.099701793 +0800
+@@ -37,7 +37,7 @@
  
  dnl Checks for library functions.
  
@@ -32,7 +31,7 @@ index f4e54ea..ff850ae 100644
  
  AM_EXTRA_RECURSIVE_TARGETS([maintainer-update-po])
  
-@@ -49,7 +49,7 @@ AC_CANONICAL_HOST
+@@ -49,7 +49,7 @@
  dnl Optional Features: AC_ARG_ENABLE calls
  dnl Optional Packages: AC_ARG_WITH calls
  dnl Some influential environment variables: AC_ARG_VAR calls
@@ -41,24 +40,22 @@ index f4e54ea..ff850ae 100644
  
  AC_CONFIG_FILES([Makefile])
  
-diff --git a/gettext-tools/Makefile.am b/gettext-tools/Makefile.am
-index 449a797..bce4ad8 100644
---- a/gettext-tools/Makefile.am
-+++ b/gettext-tools/Makefile.am
+diff -ur gettext-0.22.orig/gettext-tools/Makefile.am gettext-0.22/gettext-tools/Makefile.am
+--- gettext-0.22.orig/gettext-tools/Makefile.am	2021-06-15 04:22:46.000000000 +0800
++++ gettext-0.22/gettext-tools/Makefile.am	2023-06-23 18:24:08.822906444 +0800
 @@ -19,7 +19,7 @@
  AUTOMAKE_OPTIONS = 1.5 gnu no-dependencies
  ACLOCAL_AMFLAGS = -I m4 -I ../gettext-runtime/m4 -I ../m4 -I gnulib-m4 -I libgrep/gnulib-m4 -I libgettextpo/gnulib-m4
  
--SUBDIRS = intl gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
-+SUBDIRS = intl gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
+-SUBDIRS = gnulib-lib libgrep src libgettextpo po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
++SUBDIRS = gnulib-lib libgrep libgettextpo src po its projects styles emacs misc man m4 tests system-tests gnulib-tests examples doc
  
  EXTRA_DIST = misc/DISCLAIM
  MOSTLYCLEANFILES = core *.stackdump
-diff --git a/gettext-tools/libgettextpo/textstyle.in.h b/gettext-tools/libgettextpo/textstyle.in.h
-index 05ce0cf..936331c 100644
---- a/gettext-tools/libgettextpo/textstyle.in.h
-+++ b/gettext-tools/libgettextpo/textstyle.in.h
-@@ -239,7 +239,8 @@ typedef ostream_t file_ostream_t;
+diff -ur gettext-0.22.orig/gettext-tools/libgettextpo/textstyle.in.h gettext-0.22/gettext-tools/libgettextpo/textstyle.in.h
+--- gettext-0.22.orig/gettext-tools/libgettextpo/textstyle.in.h	2023-05-19 12:20:56.000000000 +0800
++++ gettext-0.22/gettext-tools/libgettextpo/textstyle.in.h	2023-06-23 17:43:14.099701793 +0800
+@@ -243,7 +243,8 @@
  static inline file_ostream_t
  file_ostream_create (FILE *fp)
  {
@@ -68,7 +65,7 @@ index 05ce0cf..936331c 100644
  }
  
  /* --------------------------- From fd-ostream.h --------------------------- */
-@@ -439,6 +440,30 @@ html_styled_ostream_create (_GL_ATTRIBUTE_MAYBE_UNUSED ostream_t destination,
+@@ -443,6 +444,30 @@
    return NULL;
  }
  
@@ -99,11 +96,10 @@ index 05ce0cf..936331c 100644
  /* ------------------------------ From color.h ------------------------------ */
  
  #define color_test_mode false
-diff --git a/gettext-tools/src/Makefile.am b/gettext-tools/src/Makefile.am
-index 510ab2a..72791ba 100644
---- a/gettext-tools/src/Makefile.am
-+++ b/gettext-tools/src/Makefile.am
-@@ -291,19 +291,9 @@ cldr_plurals_SOURCES = cldr-plural.y cldr-plural-exp.c cldr-plurals.c
+diff -ur gettext-0.22.orig/gettext-tools/src/Makefile.am gettext-0.22/gettext-tools/src/Makefile.am
+--- gettext-0.22.orig/gettext-tools/src/Makefile.am	2023-06-09 05:03:36.000000000 +0800
++++ gettext-0.22/gettext-tools/src/Makefile.am	2023-06-23 17:43:14.099701793 +0800
+@@ -305,19 +305,9 @@
  cldr_plurals_CFLAGS = $(AM_CFLAGS) $(INCXML)
  cldr_plurals_LDADD = libgettextsrc.la $(LDADD)
  
@@ -126,4 +122,3 @@ index 510ab2a..72791ba 100644
  
  # How to build libgettextsrc.la.
  # Need ../gnulib-lib/libgettextlib.la.
-
diff --git a/gettext-java17-2062407.patch b/gettext-java17-2062407.patch
deleted file mode 100644
index e29fe77..0000000
--- a/gettext-java17-2062407.patch
+++ /dev/null
@@ -1,116 +0,0 @@
-diff -urp '--exclude=*~' gettext-0.21.orig/gettext-tools/gnulib-lib/javacomp.c gettext-0.21/gettext-tools/gnulib-lib/javacomp.c
---- gettext-0.21.orig/gettext-tools/gnulib-lib/javacomp.c	2022-03-09 12:22:05.000000000 +0900
-+++ gettext-0.21/gettext-tools/gnulib-lib/javacomp.c	2022-03-20 18:23:53.636052943 +0900
-@@ -116,9 +116,8 @@ default_target_version (void)
-                && (java_version_cache[1] >= '2'
-                    && java_version_cache[1] <= '7')
-                && java_version_cache[2] == '\0')
--        /* Assume that these (not yet released) Java versions will behave
--           like the preceding ones.  */
--        java_version_cache = "11";
-+        /* It's one of the valid target version values.  */
-+        ;
-       else
-         java_version_cache = "1.1";
-     }
-@@ -128,7 +127,7 @@ default_target_version (void)
- /* ======================= Source version dependent ======================= */
- 
- /* Convert a source version to an index.  */
--#define SOURCE_VERSION_BOUND 8 /* exclusive upper bound */
-+#define SOURCE_VERSION_BOUND 14 /* exclusive upper bound */
- static unsigned int
- source_version_index (const char *source_version)
- {
-@@ -144,7 +143,7 @@ source_version_index (const char *source
-   else if (source_version[0] == '9' && source_version[1] == '\0')
-     return 5;
-   else if (source_version[0] == '1'
--           && (source_version[1] >= '0' && source_version[1] <= '1')
-+           && (source_version[1] >= '0' && source_version[1] <= '7')
-            && source_version[2] == '\0')
-     return source_version[1] - '0' + 6;
-   error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
-@@ -171,6 +170,10 @@ get_goodcode_snippet (const char *source
-     return "class conftest { public void m() { var i = new Integer(0); } }\n";
-   if (strcmp (source_version, "11") == 0)
-     return "class conftest { Readable r = (var b) -> 0; }\n";
-+  if (source_version[0] == '1'
-+    && (source_version[1] >= '2' && source_version[1] <= '7')
-+    && source_version[2] == '\0')
-+    return "class conftest { Readable r = (var b) -> 0; }\n";
-   error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
-   return NULL;
- }
-@@ -197,6 +200,10 @@ get_failcode_snippet (const char *source
-     return "class conftestfail { Readable r = (var b) -> 0; }\n";
-   if (strcmp (source_version, "11") == 0)
-     return NULL;
-+  if (source_version[0] == '1'
-+    && (source_version[1] >= '2' && source_version[1] <= '7')
-+    && source_version[2] == '\0')
-+    return NULL;
-   error (EXIT_FAILURE, 0, _("invalid source_version argument to compile_java_class"));
-   return NULL;
- }
-@@ -204,7 +211,7 @@ get_failcode_snippet (const char *source
- /* ======================= Target version dependent ======================= */
- 
- /* Convert a target version to an index.  */
--#define TARGET_VERSION_BOUND 11 /* exclusive upper bound */
-+#define TARGET_VERSION_BOUND 17 /* exclusive upper bound */
- static unsigned int
- target_version_index (const char *target_version)
- {
-@@ -215,7 +222,7 @@ target_version_index (const char *target
-   else if (target_version[0] == '9' && target_version[1] == '\0')
-     return 8;
-   else if (target_version[0] == '1'
--           && (target_version[1] >= '0' && target_version[1] <= '1')
-+           && (target_version[1] >= '0' && target_version[1] <= '7')
-            && target_version[2] == '\0')
-     return target_version[1] - '0' + 9;
-   error (EXIT_FAILURE, 0, _("invalid target_version argument to compile_java_class"));
-@@ -245,10 +252,10 @@ corresponding_classfile_version (const c
-     return 52;
-   if (strcmp (target_version, "9") == 0)
-     return 53;
--  if (strcmp (target_version, "10") == 0)
--    return 54;
--  if (strcmp (target_version, "11") == 0)
--    return 55;
-+  if (target_version[0] == '1'
-+           && (target_version[1] >= '0' && target_version[1] <= '7')
-+           && target_version[2] == '\0')
-+    return target_version[1] + 54;
-   error (EXIT_FAILURE, 0, _("invalid target_version argument to compile_java_class"));
-   return 0;
- }
-@@ -2439,7 +2446,7 @@ compile_java_class (const char * const *
-         }
-     }
- 
--  error (0, 0, _("Java compiler not found, try installing gcj or set $JAVAC"));
-+  /* error (0, 0, _("Java compiler not found, try installing gcj or set $JAVAC")); */
-   err = true;
- 
-  done2:
-diff -urp '--exclude=*~' gettext-0.21.orig/gettext-tools/src/write-java.c gettext-0.21/gettext-tools/src/write-java.c
---- gettext-0.21.orig/gettext-tools/src/write-java.c	2022-03-09 12:17:21.000000000 +0900
-+++ gettext-0.21/gettext-tools/src/write-java.c	2022-03-20 18:26:06.941734979 +0900
-@@ -1209,8 +1209,14 @@ msgdomain_write_java (message_list_ty *m
-      Java compilers create the class files in the source file's directory -
-      which is in a temporary directory in our case.  */
-   java_sources[0] = java_file_name;
--  if (compile_java_class (java_sources, 1, NULL, 0, "1.5", "1.6", directory,
-+  if (1
-+      && (compile_java_class (java_sources, 1, NULL, 0, "17", "17", directory,
-+                          true, false, true, verbose > 0)) /* assume JDK 17 */
-+      && (compile_java_class (java_sources, 1, NULL, 0, "11", "11", directory,
-+                          true, false, true, verbose > 0)) /* assume JDK 11 */
-+      && (compile_java_class (java_sources, 1, NULL, 0, "1.5", "1.6", directory,
-                           true, false, true, verbose > 0))
-+     )
-     {
-       if (!verbose)
-         error (0, 0,
diff --git a/gettext.spec b/gettext.spec
index 43e451a..0811325 100644
--- a/gettext.spec
+++ b/gettext.spec
@@ -3,8 +3,8 @@
 
 Summary: GNU tools and libraries for localized translated messages
 Name: gettext
-Version: 0.21.1
-Release: 3%{?dist}
+Version: 0.22
+Release: 1%{?dist}
 
 # The following are licensed under LGPLv2+:
 # - libintl and its headers
@@ -26,8 +26,7 @@ Source2: msghack.py
 Source3: msghack.1
 
 Patch1: %{name}-%{version}-disable-libtextstyle.patch
-Patch2: %{name}-%{version}-covscan.patch
-Patch3: %{name}-java17-2062407.patch
+Patch2: %{name}-0.21.1-covscan.patch
 
 # for bootstrapping
 # BuildRequires: autoconf >= 2.62
@@ -49,8 +48,6 @@ BuildRequires: zip, unzip
 %endif
 # for po-mode.el
 BuildRequires: emacs
-# for autosetup
-BuildRequires: git
 # ensure 'ARCHIVE_FORMAT=dirxz'
 BuildRequires: xz
 # for documentation
@@ -75,7 +72,6 @@ BuildRequires: glibc-langpack-tr
 BuildRequires: glibc-langpack-zh
 BuildRequires: make
 Provides: bundled(gnulib)
-Provides: bundled(libcroco) = 0.6.12
 Requires: %{name}-runtime = %{version}-%{release}
 
 %description
@@ -179,10 +175,9 @@ Substitutes the values of environment variables.
 
 
 %prep
-%autosetup -S git
-# Refresh autotools files to latest versions
-# Should be removed after 0.21:
-autoreconf --force --install
+%autosetup -p1
+# patch 1
+automake
 
 # Defeat libtextstyle attempt to bundle libxml2.  The comments
 # indicate this is done because the libtextstyle authors do not want
@@ -416,6 +411,10 @@ make check LIBUNISTRING=-lunistring
 %{_mandir}/man1/msghack.1*
 
 %changelog
+* Fri Jun 23 2023 Jens Petersen <petersen@redhat.com> - 0.22-1
+- update to 0.22 release
+- https://savannah.gnu.org/news/?id=10378
+
 * Wed Mar 29 2023 Sundeep Anand <suanand@redhat.com> - 0.21.1-3
 - update license tag to as per SPDX identifiers
 
diff --git a/sources b/sources
index 04e6282..aaf6ad9 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-SHA512 (gettext-0.21.1.tar.gz) = ccd43a43fab3c90ed99b3e27628c9aeb7186398153b137a4997f8c7ddfd9729b0ba9d15348567e5206af50ac027673d2b8a3415bb3fc65f87ad778f85dc03a05
+SHA512 (gettext-0.22.tar.gz) = e2a58dde1cae3e6b79c03e7ef3d888f7577c1f4cba283b3b0f31123ceea8c33d7c9700e83de57104644de23e5f5c374868caa0e091f9c45edbbe87b98ee51c04