diff --git a/textproc/libstemmer/Makefile b/textproc/libstemmer/Makefile
index fd87540bc68f..9cbda0bb4d5e 100644
--- a/textproc/libstemmer/Makefile
+++ b/textproc/libstemmer/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.6 2022/06/28 11:36:12 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2023/04/27 08:12:44 wiz Exp $
 
-DISTNAME=	snowball-2.1.0
+DISTNAME=	snowball-2.2.0
 PKGNAME=	${DISTNAME:S/snowball/libstemmer/}
-PKGREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	${MASTER_SITE_GITHUB:=snowballstem/}
 GITHUB_PROJECT=	snowball
diff --git a/textproc/libstemmer/distinfo b/textproc/libstemmer/distinfo
index 654475b0c172..765404b52cae 100644
--- a/textproc/libstemmer/distinfo
+++ b/textproc/libstemmer/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2022/04/25 23:22:58 tnn Exp $
+$NetBSD: distinfo,v 1.6 2023/04/27 08:12:44 wiz Exp $
 
-BLAKE2s (snowball-2.1.0.tar.gz) = 721871eda75290a6f9279d94beb5ab1383564dfdf782bf0cc9a8c0fccacc656d
-SHA512 (snowball-2.1.0.tar.gz) = 1efd7d8ab58852987e83247048244882c517e32237c8cb3c0558b66ecfb075733ce8805ebb76041e6e7d6664c236054effe66838e7c524ee529ce869aa8134f0
-Size (snowball-2.1.0.tar.gz) = 220324 bytes
-SHA1 (patch-GNUmakefile) = 85aa0b62ac0d51f31890d8c0f3eed82a3b3cba92
+BLAKE2s (snowball-2.2.0.tar.gz) = a342a1f35f5acd0c8bc7c2013cd9d4adac8db5e378a0874c3136e2adc2229f10
+SHA512 (snowball-2.2.0.tar.gz) = 02c43313de9de2518ea51cfb11f1c29145fc046c7838329bfdefd70b604009ad44b6db8175c25b0db31f03db30a6aec5857aa35775a9c204ec976df9cae62957
+Size (snowball-2.2.0.tar.gz) = 223846 bytes
+SHA1 (patch-GNUmakefile) = a4f2a2cf5409994302402433a6e1837ed82c5b08
 SHA1 (patch-libstemmer_symbol.map) = 0122f03d0ac54dae908ffd873f1ae4a6e502a56f
diff --git a/textproc/libstemmer/patches/patch-GNUmakefile b/textproc/libstemmer/patches/patch-GNUmakefile
index 5480fb95c144..e3691ed06761 100644
--- a/textproc/libstemmer/patches/patch-GNUmakefile
+++ b/textproc/libstemmer/patches/patch-GNUmakefile
@@ -1,30 +1,32 @@
-$NetBSD: patch-GNUmakefile,v 1.3 2022/04/25 23:22:58 tnn Exp $
+$NetBSD: patch-GNUmakefile,v 1.4 2023/04/27 08:12:44 wiz Exp $
 
 * Build dynamic library, from archlinux.
 
---- GNUmakefile.orig	2021-01-21 04:50:09.000000000 +0000
+--- GNUmakefile.orig	2021-11-10 02:42:18.000000000 +0000
 +++ GNUmakefile
-@@ -162,10 +162,10 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.
+@@ -170,12 +170,12 @@ C_OTHER_OBJECTS = $(C_OTHER_SOURCES:.c=.
  JAVA_CLASSES = $(JAVA_SOURCES:.java=.class)
  JAVA_RUNTIME_CLASSES=$(JAVARUNTIME_SOURCES:.java=.class)
  
 -CFLAGS=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
--CPPFLAGS=-Iinclude
-+CFLAGS+=-fPIC -O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
-+CPPFLAGS+=-Iinclude
+-CPPFLAGS=
++CFLAGS+=-O2 -W -Wall -Wmissing-prototypes -Wmissing-declarations
++CPPFLAGS+=
  
--all: snowball libstemmer.o stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
-+all: snowball libstemmer.o libstemmer.so stemwords $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ INCLUDES=-Iinclude
  
- clean:
- 	rm -f $(COMPILER_OBJECTS) $(RUNTIME_OBJECTS) \
-@@ -212,6 +212,9 @@ libstemmer/libstemmer.o: libstemmer/modu
- libstemmer.o: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
- 	$(AR) -cru $@ $^
+-all: snowball$(EXEEXT) libstemmer.a stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
++all: snowball$(EXEEXT) libstemmer.so stemwords$(EXEEXT) $(C_OTHER_SOURCES) $(C_OTHER_HEADERS) $(C_OTHER_OBJECTS)
+ 
+ algorithms.mk: libstemmer/mkalgorithms.pl libstemmer/modules.txt
+ 	libstemmer/mkalgorithms.pl algorithms.mk libstemmer/modules.txt
+@@ -214,6 +214,9 @@ libstemmer/libstemmer.c: libstemmer/libs
+ libstemmer/libstemmer_utf8.c: libstemmer/libstemmer_c.in
+ 	sed 's/@MODULES_H@/modules_utf8.h/' $^ >$@
  
 +libstemmer.so: libstemmer/libstemmer.o $(RUNTIME_OBJECTS) $(C_LIB_OBJECTS)
 +	$(CC) $(CFLAGS) -shared $(LDFLAGS) -Wl,-soname,libstemmer.so.0 -Wl,--version-script=libstemmer/symbol.map -o $@.0.0.0 $^
 +
- stemwords: $(STEMWORDS_OBJECTS) libstemmer.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $^
+ libstemmer/modules.h libstemmer/mkinc.mak: libstemmer/mkmodules.pl libstemmer/modules.txt
+ 	libstemmer/mkmodules.pl $@ $(c_src_dir) libstemmer/modules.txt libstemmer/mkinc.mak