diff --git a/srcpkgs/removed-packages/template b/srcpkgs/removed-packages/template
index 0d5ea74d28..c5afedcb24 100644
--- a/srcpkgs/removed-packages/template
+++ b/srcpkgs/removed-packages/template
@@ -292,6 +292,7 @@ replaces="
  ttyload-git<=20141117_4
  tuxc<=1.1_3
  urlmatch-git<=20141116_2
+ uwsgi-python<=2.0.18_3
  v8<=3.24.35.33_4
  volnoti<=0.1_1
  vte<=0.28.2_16
diff --git a/srcpkgs/uwsgi-python b/srcpkgs/uwsgi-cgi
similarity index 100%
rename from srcpkgs/uwsgi-python
rename to srcpkgs/uwsgi-cgi
diff --git a/srcpkgs/uwsgi/template b/srcpkgs/uwsgi/template
index 1446c355e1..507987723d 100644
--- a/srcpkgs/uwsgi/template
+++ b/srcpkgs/uwsgi/template
@@ -1,45 +1,28 @@
 # Template file for 'uwsgi'
 pkgname=uwsgi
-version=2.0.18
-revision=3
-hostmakedepends="python python3"
-makedepends="python-devel python3-devel"
+version=2.0.19.1
+revision=1
+hostmakedepends="python3"
+makedepends="python3-devel"
 short_desc="Fast, self-healing application container server"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-or-later"
+license="GPL-2.0-linking-exception"
 homepage="http://projects.unbit.it/uwsgi"
 distfiles="https://github.com/unbit/uwsgi/archive/${version}.tar.gz"
-checksum=4972ac538800fb2d421027f49b4a1869b66048839507ccf0aa2fda792d99f583
+checksum=bf17cdbb9bd8bcb7c1633e34d9d7308cb4cc19eb0ff2d61057f840c1ba1fc41b
 
 _libdir=usr/lib/uwsgi
 
-subpackages="uwsgi-python uwsgi-python3"
-case "$XBPS_TARGET_MACHINE" in
-	armv[67]l-musl) subpackages="uwsgi-python" ;;
-	aarch64-musl) makedepends+=" gettext-devel" ;;
-esac
-
 pre_configure() {
-	sed -e "s|uc.get('plugin_dir')|'.'|" \
-		-i uwsgiconfig.py
-	sed -e "s|\(plugin_dir =\).*|\1 /$_libdir|" \
-		-i buildconf/base.ini
+	vsed -i uwsgiconfig.py -e "s|uc.get('plugin_dir')|'.'|"
+	vsed -i buildconf/base.ini -e "s|\(plugin_dir =\).*|\1 /$_libdir|"
 }
 
 do_build() {
 	local _cflags="$CFLAGS"
 	local _ldflags="$LDFLAGS"
 
-	python2 uwsgiconfig.py --build core
-
-	if [ "$CROSS_BUILD" ]; then
-		_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py2_inc}
-			-I${XBPS_CROSS_BASE}/usr/include"
-		_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py2_lib}
-			-L${XBPS_CROSS_BASE}/usr/lib"
-	fi
-	CFLAGS="$_cflags" LDFLAGS="$_ldflags" python2 uwsgiconfig.py \
-		--plugin plugins/python core python
+	python3 uwsgiconfig.py --build core
 
 	if [ "$CROSS_BUILD" ]; then
 		_cflags="$CFLAGS -I${XBPS_CROSS_BASE}/${py3_inc}
@@ -47,29 +30,27 @@ do_build() {
 		_ldflags="$LDFLAGS -L${XBPS_CROSS_BASE}/${py3_lib}
 			-L${XBPS_CROSS_BASE}/usr/lib"
 	fi
-	case "$subpackages" in
-		*uwsgi-python3*)
-			CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
-				--plugin plugins/python core python3
-			;;
-	esac
+
+	CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
+		--plugin plugins/python core python3
+	CFLAGS="$_cflags" LDFLAGS="$_ldflags" python3 uwsgiconfig.py \
+		--plugin plugins/cgi core cgi
 }
 
 do_install() {
-	mkdir -p $PKGDESTDIR/usr/bin $PKGDESTDIR/$_libdir
-	cp uwsgi $PKGDESTDIR/usr/bin
-	cp *_plugin.so $PKGDESTDIR/$_libdir
+	vbin uwsgi
 }
 
-uwsgi-python_package() {
-	short_desc="$short_desc (Python2 plugin)"
-	pkg_install() {
-		vmove $_libdir/python_plugin.so
-	}
-}
 uwsgi-python3_package() {
 	short_desc="$short_desc (Python3 plugin)"
 	pkg_install() {
-		vmove $_libdir/python3_plugin.so
+		vcopy python3_plugin.so $_libdir
+	}
+}
+
+uwsgi-cgi_package() {
+	short_desc="$short_desc (CGI plugin)"
+	pkg_install() {
+		vcopy cgi_plugin.so $_libdir
 	}
 }