diff --git a/community/openshadinglanguage/PKGBUILD b/community/openshadinglanguage/PKGBUILD
index c6643c248..7c8ba7275 100644
--- a/community/openshadinglanguage/PKGBUILD
+++ b/community/openshadinglanguage/PKGBUILD
@@ -7,21 +7,28 @@
 
 pkgname=openshadinglanguage
 pkgver=1.5.10
-pkgrel=1
+pkgrel=2
 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=('b828366f056e115b539ee1780883fc7d')
+source=(https://github.com/imageworks/OpenShadingLanguage/archive/Release-${pkgver}.tar.gz
+        https://github.com/imageworks/OpenShadingLanguage/commit/163df11a3af32295757cfe008d1ba2b757cc7b7b.patch
+        https://github.com/imageworks/OpenShadingLanguage/pull/412.patch)
+md5sums=('b828366f056e115b539ee1780883fc7d'
+         'e980ed0a9480958307fa048544154887'
+         'd21cab675ce13c9f0640e1f6a662d2b9')
 
 build() {
   cd OpenShadingLanguage-Release-$pkgver
 
   # Fails building this file on i686
-  sed -i "/src\/testshade/d" CMakeLists.txt
+  #sed -i "/src\/testshade/d" CMakeLists.txt
+
+  patch -Np1 < $srcdir/412.patch
+  patch -Np1 < $srcdir/163df11a3af32295757cfe008d1ba2b757cc7b7b.patch
 
   cd src
 
@@ -30,11 +37,11 @@ build() {
 
   [ "${CARCH}" == "arm" -o "${CARCH}" == "armv6h" ] && BITCODE="-DUSE_LLVM_BITCODE=OFF"
 
-  cmake \
+  cmake ../.. \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DLLVM_STATIC=0 ${BITCODE} \
     -DSTOP_ON_WARNING=0 \
-    ../..
+    -DCMAKE_CXX_FLAGS="-std=c++11"
   make
 }