diff --git a/mingw-w64-openshadinglanguage/0010-llvm7-support.patch b/mingw-w64-openshadinglanguage/0010-llvm7-support.patch
new file mode 100644
index 0000000000..717b3a0d37
--- /dev/null
+++ b/mingw-w64-openshadinglanguage/0010-llvm7-support.patch
@@ -0,0 +1,26 @@
+--- OpenShadingLanguage-Release-1.8.15/src/liboslexec/llvm_util.cpp.orig	2018-12-06 11:58:57.216034300 +0300
++++ OpenShadingLanguage-Release-1.8.15/src/liboslexec/llvm_util.cpp	2018-12-06 11:59:00.476038800 +0300
+@@ -99,6 +99,11 @@
+ #  include <llvm/Transforms/Scalar/GVN.h>
+ #endif
+ 
++#if OSL_LLVM_VERSION >= 70
++#include <llvm/Transforms/Utils.h>
++#include <llvm/Transforms/InstCombine/InstCombine.h>
++#endif
++
+ OSL_NAMESPACE_ENTER
+ 
+ namespace pvt {
+@@ -1720,7 +1725,11 @@
+     std::string local_error;
+     llvm::raw_fd_ostream out (filename, err ? *err : local_error);
+ #endif
++#if OSL_LLVM_VERSION >= 70
++    llvm::WriteBitcodeToFile (*module(), out);
++#else
+     llvm::WriteBitcodeToFile (module(), out);
++#endif
+ 
+ #if OSL_LLVM_VERSION >= 36
+     if (err && local_error)
diff --git a/mingw-w64-openshadinglanguage/PKGBUILD b/mingw-w64-openshadinglanguage/PKGBUILD
index dd4eccf8ed..d2abe27ef1 100644
--- a/mingw-w64-openshadinglanguage/PKGBUILD
+++ b/mingw-w64-openshadinglanguage/PKGBUILD
@@ -6,7 +6,7 @@ pkgname="${MINGW_PACKAGE_PREFIX}-${_realname}"
 conflicts=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 replaces=("${MINGW_PACKAGE_PREFIX}-${_realname}-git")
 pkgver=1.8.15
-pkgrel=1
+pkgrel=3
 pkgdesc="Advanced shading language for production GI renderers (mingw-w64)"
 arch=('any')
 url="https://github.com/imageworks/OpenShadingLanguage/"
@@ -34,7 +34,8 @@ source=(${_realname}-${pkgver}.tar.gz::https://github.com/imageworks/OpenShading
         0005-Fix-cast-from-void-ptr.patch
         0007-Fix-bad-casts-with-intptr_t.patch
         0008-openimageio-api-changes.patch
-        0009-find-pugixml.patch)
+        0009-find-pugixml.patch
+        0010-llvm7-support.patch)
 sha256sums=('079a2d02586f6bc4e9b12ddc555f2c46db7603501b87cfdd898adb3b92de695a'
             'e3f6ad09619d122ada129cbc77d7778751abfecef9ac7e0a60d9550c811df643'
             'c9e02624cf6e607118f1f7fd8bf8bda9af5103afde5770a11fa5ccf49916fc5b'
@@ -43,7 +44,8 @@ sha256sums=('079a2d02586f6bc4e9b12ddc555f2c46db7603501b87cfdd898adb3b92de695a'
             '541cc1eb0c506e253de2f26af37dc6e35de891a940906c6e33a2f4774a4a844e'
             'd3e6d2bdd059ec9b1581b02c9f736f26a06e1189929c6276d1d7d81204bb3535'
             'ccf77deca5282a878d05508a56c658cc29efea4e53845fbd508855ecf66a1792'
-            'b65fecac8d338f506abf168154ec97baa7523497419f7fdb0a53442ae652adb3')
+            'b65fecac8d338f506abf168154ec97baa7523497419f7fdb0a53442ae652adb3'
+            '7d1d5739d5b035f22dfc1ceeefc2237edb34521c1da3fe5667bb902ad067d386')
 
 prepare() {
   cd ${srcdir}/OpenShadingLanguage-Release-${pkgver}
@@ -55,6 +57,7 @@ prepare() {
   patch -p1 -i ${srcdir}/0007-Fix-bad-casts-with-intptr_t.patch
   patch -p1 -i ${srcdir}/0008-openimageio-api-changes.patch
   patch -p1 -i ${srcdir}/0009-find-pugixml.patch
+  patch -p1 -i ${srcdir}/0010-llvm7-support.patch
 }
 
 build() {
@@ -71,7 +74,6 @@ build() {
     -G"MSYS Makefiles" \
     -DCMAKE_INSTALL_PREFIX=${MINGW_PREFIX} \
     -DSTOP_ON_WARNING=OFF \
-    -DILMBASE_CUSTOM=True \
     -DUSE_EXTERNAL_PUGIXML=ON \
     -DLLVM_STATIC=1 \
     -DOSL_BUILD_CPP11=1 \