diff --git a/srcpkgs/buildbot/patches/terse-irc.patch b/srcpkgs/buildbot/patches/terse-irc.patch
new file mode 100644
index 00000000000..5036cd9ebfe
--- /dev/null
+++ b/srcpkgs/buildbot/patches/terse-irc.patch
@@ -0,0 +1,38 @@
+--- buildbot/status/words.py.orig
++++ buildbot/status/words.py
+@@ -439,9 +439,9 @@
+         self.send(r)
+ 
+     results_descriptions = {
+-        SUCCESS: ("Success", 'GREEN'),
+-        WARNINGS: ("Warnings", 'YELLOW'),
+-        FAILURE: ("Failure", 'RED'),
++        SUCCESS: ("OK", 'GREEN'),
++        WARNINGS: ("Warn", 'YELLOW'),
++        FAILURE: ("Fail", 'RED'),
+         EXCEPTION: ("Exception", 'PURPLE'),
+         RETRY: ("Retry", 'AQUA_LIGHT'),
+     }
+@@ -466,19 +466,18 @@
+         results = self.getResultsDescriptionAndColor(build.getResults())
+         if self.reportBuild(builder_name, buildnum):
+             if self.useRevisions:
+-                r = "build containing revision(s) [%s] on %s is complete: %s" % \
++                r = "%s/%s: %s" % \
+                     (buildrevs, builder_name, results[0])
+             else:
+                 r = "build #%d of %s is complete: %s" % \
+                     (buildnum, builder_name, results[0])
+ 
+-            r += ' [%s]' % maybeColorize(" ".join(build.getText()), results[1], self.useColors)
+             buildurl = self.bot.status.getURLForThing(build)
+             if buildurl:
+-                r += "  Build details are at %s" % buildurl
++                r += ": %s" % buildurl
+ 
+             if self.bot.showBlameList and build.getResults() != SUCCESS and len(build.changes) != 0:
+-                r += '  blamelist: ' + ', '.join(list(set([c.who for c in build.changes])))
++                r += '  blame: ' + ', '.join(list(set([c.who for c in build.changes])))
+ 
+             self.send(r)
+ 
diff --git a/srcpkgs/buildbot/template b/srcpkgs/buildbot/template
index c5f52759cc9..c753cd7c502 100644
--- a/srcpkgs/buildbot/template
+++ b/srcpkgs/buildbot/template
@@ -1,16 +1,27 @@
 # Template file for 'buildbot'
 pkgname=buildbot
-version=2.4.1
-revision=1
+version=0.8.14
+revision=3
 archs=noarch
-build_style=python3-module
+build_style=python2-module
 pycompile_module="buildbot"
 pycompile_dirs="usr/share/buildbot/contrib"
-hostmakedepends="python3 python3-setuptools"
-depends="python3-autobahn python3-dateutil python3-Jinja2 python3-PyJWT python3-sqlalchemy-migrate python3-Twisted"
-short_desc="System to automate the compile/test cycle"
+hostmakedepends="python"
+depends="python-setuptools python-dateutil python-Jinja2 python-sqlalchemy-migrate python-Twisted"
+short_desc="A system to automate the compile/test cycle"
 maintainer="Orphaned <orphan@voidlinux.org>"
-license="GPL-2.0-only"
 homepage="https://buildbot.net/"
+license="GPL-2"
 distfiles="${PYPI_SITE}/b/${pkgname}/${pkgname}-${version}.tar.gz"
-checksum=a8330baef61bd9035a9f51a717a28706a4374222f4781d2c22bbbc3ae3b91a6b
+checksum=331efd07bd7522c222a8fb258801e8d78332c88d778ee76416b9e1028676e964
+
+pre_install() {
+	sed -i 's,#!/usr/bin/env jython,#!/usr/bin/python2,' contrib/run_maxq.py
+}
+post_install() {
+	# Install all contrib modules.
+	local contribdir=${DESTDIR}/usr/share/buildbot/contrib
+
+	vmkdir usr/share/buildbot/contrib
+	install -m755 ${wrksrc}/contrib/*.py ${contribdir}
+}