diff --git a/main/rsyslog/APKBUILD b/main/rsyslog/APKBUILD
index f4033663f674c6eb0eb8cbde87ab6f155c9943f4..636ed0b11807d01c636037e9e6848cdbef632ef3 100644
--- a/main/rsyslog/APKBUILD
+++ b/main/rsyslog/APKBUILD
@@ -28,6 +28,7 @@ makedepends="
 	util-linux-dev
 	zlib-dev
 	"
+install="$pkgname.post-upgrade"
 subpackages="$pkgname-doc $pkgname-dbg"
 source="https://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz
 	$pkgname.initd
@@ -40,12 +41,16 @@ source="https://www.rsyslog.com/files/download/$pkgname/$pkgname-$pkgver.tar.gz
 builddir="$srcdir/$pkgname-$pkgver"
 
 _plugins="
+	crypto:lmcry_gcry
 	elasticsearch:omelasticsearch
 	hiredis:omhiredis
+	http:fmhttp
 	mysql:ommysql
 	pgsql:ompgsql
 	snmp:omsnmp
+	testing:omtesting
 	tls:lmnsd_gtls
+	udpspoof:omudpspoof
 	"
 for _i in $_plugins; do
 	subpackages="$subpackages $pkgname-${_i%%:*}:_plugin"
diff --git a/main/rsyslog/rsyslog.post-upgrade b/main/rsyslog/rsyslog.post-upgrade
new file mode 100644
index 0000000000000000000000000000000000000000..2654196962d52d655efb86c1b760b1f31ed2018b
--- /dev/null
+++ b/main/rsyslog/rsyslog.post-upgrade
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+ver_new="$1"
+ver_old="$2"
+
+if [ "$(apk version -t "$ver_old" "8.4.0-r2")" = "<" ]; then
+	cat >&2 <<-EOF
+	*
+	* The following modules has been moved to separate packages:
+ 	*     lmcry_gcry (crypto), fmhttp (http), omudpspoof, omtesting
+	* If you use one of these, install the relevant package(s), e.g.:
+	*     apk add rsyslog-crypto
+	*
+	EOF
+fi