diff --git a/community/termite/APKBUILD b/community/termite/APKBUILD
index cecac3628b5..2332b2269fc 100644
--- a/community/termite/APKBUILD
+++ b/community/termite/APKBUILD
@@ -2,7 +2,8 @@
 # Maintainer: Ian Bashford <ianbashford@gmail.com>
 pkgname=termite
 pkgver=15
-pkgrel=2
+pkgrel=3
+_vtever=0.50.2-ng
 _util_commit=409b8449ab51fccf51057621168c9c15c54d4807
 pkgdesc="A simple VTE-based terminal"
 url="https://github.com/thestinger/termite"
@@ -10,9 +11,11 @@ arch="all"
 options="!check"  # No test suite.
 license="LGPL-2.1-or-later AND MIT"
 depends="$pkgname-terminfo"
-makedepends="gtk+3.0-dev vte3-dev pcre2-dev ncurses"
+makedepends="gtk+3.0-dev pcre2-dev ncurses autoconf automake libtool
+	gtk-doc glib-dev gnutls-dev gperf intltool"
 subpackages="$pkgname-doc $pkgname-terminfo::noarch"
 source="$pkgname-$pkgver.tar.gz::https://github.com/thestinger/termite/archive/v$pkgver.tar.gz
+	vte-ng-$_vtever.tar.gz::https://github.com/thestinger/vte-ng/archive/$_vtever.tar.gz
 	util-$_util_commit.tar.gz::https://github.com/thestinger/util/archive/$_util_commit.tar.gz
 	"
 
@@ -20,15 +23,39 @@ unpack() {
 	default_unpack
 	cd "$builddir"
 	rmdir util
-	mv "$srcdir"/util-${_util_commit} util
+	mv "$srcdir"/util-$_util_commit util
+}
+
+prepare() {
+	default_prepare
+
+	cd "$srcdir/vte-ng-$_vtever"
+	echo 'sources: $(BUILT_SOURCES)' >> src/Makefile.am
+	NOCONFIGURE=1 ./autogen.sh
 }
 
 build() {
+	cd "$srcdir/vte-ng-$_vtever"
+	./configure \
+		--prefix="$srcdir/vte-static" \
+		--localedir="/usr/share/$pkgname/locale" \
+		--enable-static \
+		--disable-shared \
+		--disable-introspection \
+		--disable-vala \
+		--disable-gtk-doc \
+		--disable-glade-catalogue
+	make -C src sources install-exec install-data -j 1
+	make install-pkgconfigDATA
+	cd "$builddir"
+	export PKG_CONFIG_PATH="$srcdir/vte-static/lib/pkgconfig"
 	make
 }
 
 package() {
-	make DESTDIR="$pkgdir" PREFIX=/usr install
+	cd "$srcdir"
+	make -C "$srcdir/vte-ng-$_vtever"/po DESTDIR="$pkgdir" install-data
+	make -C "$builddir" DESTDIR="$pkgdir" PREFIX=/usr install
 }
 
 terminfo() {
@@ -38,4 +65,5 @@ terminfo() {
 }
 
 sha512sums="1c224af85c35c4b755a150c0c701ddfd5414b382bd78853fb89730a6806ed1c54820987285541ecba0865a35f3b24e9ced88fcc888c43435e60c5d7296b2b0f6  termite-15.tar.gz
+9c7e8f7ebbd6564c1aab8f9569d5ad8e1032c3548b3879dde6329a6bc678f466a7105d8ace45dfc36d9070ed3330480992d9c36ca860a0b5f5c3813fdd4df231  vte-ng-0.50.2-ng.tar.gz
 10e13271a0661b0f25e5c198bd40c3e79bb425cc6ea0f4a73d4c90152ee09490b01d737bb1d2633d6574888c46ac0b1396742f444606f081ede4c289f8151c00  util-409b8449ab51fccf51057621168c9c15c54d4807.tar.gz"
diff --git a/community/termite/fix-W_EXITCODE.patch b/community/termite/fix-W_EXITCODE.patch
new file mode 100644
index 00000000000..8ada8648898
--- /dev/null
+++ b/community/termite/fix-W_EXITCODE.patch
@@ -0,0 +1,17 @@
+Source: https://mail-archives.apache.org/mod_mbox/mesos-reviews/201610.mbox/%3C20161014170728.1720.54446@reviews.apache.org%3E
+Upstream: No
+Reason: fixes compilation with musl that doesn't define W* macros.
+
+--- a/src/widget.cc
++++ b/src/widget.cc
+@@ -28,6 +28,10 @@
+ #include "vtegtk.hh"
+ #include "debug.h"
+ 
++#ifndef W_EXITCODE
++#define W_EXITCODE(ret, sig)  ((ret) << 8 | (sig))
++#endif
++
+ using namespace std::literals;
+ 
+ namespace vte {