diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD
index 652f66cd4..bf1594dfd 100644
--- a/community/openshadinglanguage/PKGBUILD
+++ b/community/openshadinglanguage/PKGBUILD
@@ -6,20 +6,25 @@
 #  - set -DUSE_LLVM_BITCODE=OFF for v5 and v6
 
 pkgname=openshadinglanguage
-pkgver=1.4.0
-pkgrel=2
+pkgver=1.5.4dev
+pkgrel=1
 pkgdesc="Advanced shading language for production GI renderers"
 arch=(i686 x86_64)
 url="https://github.com/imageworks/OpenShadingLanguage"
 license=('custom')
 depends=('boost-libs' 'openimageio' 'openexr' 'llvm' 'freetype2' 'libpng' 'libtiff')
 makedepends=('boost' 'cmake' 'clang')
-source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz)
-md5sums=('dcc7b6dfbc68d7af0d5cfa2940ff205b')
+source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
+        https://github.com/imageworks/OpenShadingLanguage/pull/320.patch)
+md5sums=('4dda1fb2919d3440344d36ecbdf13d47'
+         '590137809ea344b41b1ad1e0fc81738c')
 
 build() {
   cd OpenShadingLanguage-Release-$pkgver
 
+  # LLVM 3.4 build fix
+  patch -Np1 < $srcdir/320.patch
+
   cd src
 
   [[ -d build ]] && rm -r build