diff --git a/trunk/PKGBUILD b/trunk/PKGBUILD
index 53d4fe1..7f1bafc 100644
--- a/trunk/PKGBUILD
+++ b/trunk/PKGBUILD
@@ -10,22 +10,25 @@ url='http://iolanguage.com/'
 license=('BSD')
 depends=('pcre' 'libsndfile' 'libxmu' 'freetype2' 'libedit' 'libxml2' 'libtiff' 'libevent' 'yajl' 'mariadb-libs' 'lzo' 'libpng' 'util-linux' 'freeglut' 'libjpeg-turbo' 'libtheora' 'python')
 makedepends=('cmake' 'git')
-options=('!makeflags' '!buildflags')
-source=("git+https://github.com/stevedekorte/io#commit=5fffec7cbe9679632ff793befacedd92f79d7f0f" build.patch)
+options=('!makeflags')
+source=("git+https://github.com/stevedekorte/io#commit=5fffec7cbe9679632ff793befacedd92f79d7f0f" noexec.patch::https://github.com/IoLanguage/io/commit/5b88e9769c1d4629e9a4a01c78b57c0d80c7a70c.patch build.patch)
 sha256sums=('SKIP'
+            '4f322ddbb6427d8b3ddc9d34786b9676b3cec26c867040626b6246d03e9dad24'
             '67649900fba515520c934dcb24c4da475c11c84a7e83171418c742988304b80e')
 
 prepare() {
-  sed -i "s:20151111:${pkgver//./}:" io/libs/iovm/source/IoVersion.h
-
-  cd io
-  patch -Np1 -i ${srcdir}/build.patch
+  cd $pkgname
+  patch -Np1 -i ../noexec.patch
+  patch -Np1 -i ../build.patch
+  sed -i "s:20151111:${pkgver//./}:" libs/iovm/source/IoVersion.h
 }
 
 build() {
-  mkdir -p build
-  cd build
-  cmake ../io -DCMAKE_INSTALL_PREFIX=/usr
+  cmake -B build -S $pkgname \
+        -DCMAKE_BUILD_TYPE='None' \
+        -DCMAKE_INSTALL_PREFIX='/usr' \
+        -DCMAKE_SKIP_RPATH=TRUE
+  make -C build
 }
 
 package() {