diff --git a/PKGBUILD b/PKGBUILD
index 129979a..1ecfb9e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -11,14 +11,17 @@ arch=('i686' 'x86_64')
 license=('ZLIB')
 depends=('boost-libs' 'xz')
 makedepends=('boost' 'cmake')
-source=("http://constexpr.org/innoextract/files/$pkgname-$pkgver.tar.gz"{,.sig})
+source=("http://constexpr.org/innoextract/files/$pkgname-$pkgver.tar.gz"{,.sig}
+         upstream-cmake35.patch)
 sha256sums=('f2594e992ccf2859455475794803b29a67393fadb69d4df1eec34c451ffa48cf'
-            'SKIP')
+            'SKIP'
+            '6fd76ac56142fe3e56886be713b023ee9673c45a6c7b3b7401aa22ed7ed4f2b7')
 validpgpkeys=("ADE9653703D4ADE0E997758128555A66D7E1DEC9") # Daniel Scharrer

 build() {
   cd $pkgname-$pkgver
-
+
+  patch -Np1 -i "${srcdir}/upstream-cmake35.patch"
   cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release
   make
 }
diff --git a/upstream-cmake35.patch b/upstream-cmake35.patch
new file mode 100644
index 0000000..a8d4792
--- /dev/null
+++ b/upstream-cmake35.patch
@@ -0,0 +1,30 @@
+From 01705758dd04d937160c99c8b87c6fa2057db894 Mon Sep 17 00:00:00 2001
+From: Daniel Scharrer <daniel@constexpr.org>
+Date: Tue, 23 Feb 2016 05:45:50 +0100
+Subject: [PATCH] CMake: Disable variable expansion for quoted strings in if()
+
+This makes the build system more rubust against stray variables
+coming from included CMake scripts provided by the system.
+
+Fixes build with CMake 3.5 (tested with 3.5.0-rc3).
+
+Fixes: issue #50
+---
+ CMakeLists.txt | 5 +++++
+ 1 file changed, 5 insertions(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 02e0308..8653b93 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -2,6 +2,11 @@ project(innoextract)
+
+ cmake_minimum_required(VERSION 2.8)
+
++if(POLICY CMP0054)
++  # CMake 3.1+: Only interpret if() arguments as variables or keywords when unquoted.
++  cmake_policy(SET CMP0054 NEW)
++endif()
++
+
+ # Define configuration options