diff --git a/.SRCINFO b/.SRCINFO
index b1959c47336..e7baa90b670 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,28 @@
 pkgbase = lv2-git
 	pkgdesc = A standard for plugins and matching host applications, mainly targeted at audio processing and generation.
-	pkgver = 1.16.0.r1120.0fa4d48
+	pkgver = 1.16.2.r1186.18a9aef
 	pkgrel = 1
 	url = http://lv2plug.in/
 	arch = i686
 	arch = x86_64
 	license = custom:ISC
 	makedepends = git
-	makedepends = python2
+	makedepends = python
 	makedepends = libsndfile
 	makedepends = gtk2
 	optdepends = libsndfile: example sampler plugin
 	optdepends = gtk2: example scope plugin
 	optdepends = python: lv2specgen script
 	provides = lv2
-	provides = lv2=1.16.0
+	provides = lv2=1.16.2
 	provides = lv2core
 	provides = lv2-svn
 	conflicts = lv2
 	conflicts = lv2-svn
 	replaces = lv2core
-	source = lv2::git+http://lv2plug.in/git/lv2.git
+	source = lv2::git+https://gitlab.com/lv2/lv2.git
+	source = autowaf::git+https://gitlab.com/drobilla/autowaf.git
+	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = lv2-git
diff --git a/.gitignore b/.gitignore
index c1f7b97db80..cbd0914f1c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,7 @@
-lv2
-src
-pkg
+autowaf/
+lv2/
+src/
+pkg/
 lv2-git-*.tar.xz
 lv2-git-*.src.tar.gz
 .AURINFO
diff --git a/PKGBUILD b/PKGBUILD
index c1a498d3ad1..bc6690cb0a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,21 +3,22 @@
 
 _pkgname=lv2
 pkgname="${_pkgname}-git"
-pkgver=1.16.0.r1120.0fa4d48
+pkgver=1.16.2.r1186.18a9aef
 pkgrel=1
 pkgdesc="A standard for plugins and matching host applications, mainly targeted at audio processing and generation."
 arch=('i686' 'x86_64')
 url="http://lv2plug.in/"
 license=('custom:ISC')
-makedepends=('git' 'python2' 'libsndfile' 'gtk2')
+makedepends=('git' 'python' 'libsndfile' 'gtk2')
 optdepends=('libsndfile: example sampler plugin'
             'gtk2: example scope plugin'
             'python: lv2specgen script')
 provides=("${_pkgname}" "${_pkgname}=${pkgver//.r*/}" 'lv2core' "${_pkgname}-svn")
 conflicts=("${_pkgname}" "${_pkgname}-svn")
 replaces=('lv2core')
-source=("${_pkgname}::git+http://lv2plug.in/git/lv2.git")
-md5sums=('SKIP')
+source=("${_pkgname}::git+https://gitlab.com/lv2/lv2.git"
+        'autowaf::git+https://gitlab.com/drobilla/autowaf.git')
+md5sums=('SKIP' 'SKIP')
 
 pkgver() {
   cd "${srcdir}/${_pkgname}"
@@ -25,16 +26,24 @@ pkgver() {
   echo $(awk -F "'" '/^VERSION/{print $2}' wscript).r$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
+prepare() {
+  cd "${srcdir}/${_pkgname}"
+
+  git submodule init
+  git config submodule.waflib.url "${srcdir}/autowaf"
+  git submodule update
+}
+
 build() {
   cd "${srcdir}/${_pkgname}"
 
-  python2 waf configure --prefix=/usr
-  python2 waf build $MAKEFLAGS
+  python waf configure --prefix=/usr
+  python waf build $MAKEFLAGS
 }
 
 package() {
   cd "${srcdir}/${_pkgname}"
 
-  python2 waf install --destdir="$pkgdir"
+  python waf install --destdir="$pkgdir"
   install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }