diff --git a/RE-flex/PKGBUILD b/RE-flex/PKGBUILD
new file mode 100644
index 0000000..2fe9a38
--- /dev/null
+++ b/RE-flex/PKGBUILD
@@ -0,0 +1,43 @@
+_pkgname="RE-flex"
+pkgname="${_pkgname}-git"
+pkgver=v1.1.5.r0.ge901cdd
+pkgrel=2
+pkgdesc="The regex-centric, fast and flexible scanner generator for C++"
+arch=('x86_64')
+url="https://github.com/Genivia/RE-flex"
+license=('BSD')
+depends=()
+provides=('RE-flex')
+conflicts=()
+optdepends=('graphviz: To visualize the FSM graphs generated with reflex option '"'"'--graphs-file'"'"
+			'boost: To use Boost.Regex as a regex engine with the RE/flex library and scanner generator')
+epoch=1
+source=(git+https://github.com/Genivia/RE-flex.git)
+sha256sums=('SKIP')
+
+pkgver() {
+	cd "${_pkgname}"
+	git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+prepare() {
+	cd "${_pkgname}"
+	autoreconf -fi
+	./configure --mandir=/usr/share/man/
+}
+
+build() {
+	cd "${_pkgname}"
+	make
+}
+
+check() {
+	: #Do nothing
+}
+
+package() {
+	cd "${_pkgname}"
+	make PREFIX=/usr DESTDIR="${pkgdir}/" install
+	install -m644 -D LICENSE.txt "$pkgdir/usr/share/licenses/${pkgname}/LICENSE"
+	install -m644 -D README.md "$pkgdir/usr/share/doc/$pkgname/README"
+}
diff --git a/mtxclient-git/PKGBUILD b/mtxclient-git/PKGBUILD
index 6e18342..0d2d4e0 100644
--- a/mtxclient-git/PKGBUILD
+++ b/mtxclient-git/PKGBUILD
@@ -1,5 +1,5 @@
 pkgname=mtxclient-git
-pkgver=v0.2.0.r24.g5422d28
+pkgver=v0.2.0.r32.g6f7b35a
 pkgrel=1
 pkgdesc="Client API library for Matrix, built on top of Boost.Asio"
 arch=('x86_64' 'i686')