diff --git a/dev-util/cmake/cmake-3.9.5.recipe b/dev-util/cmake/cmake-3.9.5.recipe
index ae0a92760..995429215 100644
--- a/dev-util/cmake/cmake-3.9.5.recipe
+++ b/dev-util/cmake/cmake-3.9.5.recipe
@@ -7,14 +7,14 @@ of your choice."
 HOMEPAGE="https://cmake.org/"
 COPYRIGHT="2002-2017 Kitware, Inc., Insight Consortium"
 LICENSE="CMake"
-REVISION="1"
+REVISION="2"
 SOURCE_URI="https://cmake.org/files/v3.9/cmake-$portVersion.tar.gz"
 CHECKSUM_SHA256="6220c1683b4e6bb8f38688fa3ffb17a7cf39f36317c2ddfdc3f12f09d086c166"
 SOURCE_DIR="cmake-$portVersion"
 PATCHES="cmake-$portVersion.patchset"
 
 ARCHITECTURES="!x86_gcc2 ?x86 x86_64 ?arm"
-SECONDARY_ARCHITECTURES="?x86"
+SECONDARY_ARCHITECTURES="x86"
 
 PROVIDES="
 	cmake$secondaryArchSuffix = $portVersion compat >= 3
diff --git a/dev-util/cmake/patches/cmake-3.9.5.patchset b/dev-util/cmake/patches/cmake-3.9.5.patchset
index 6a38b4fa1..0a47212ce 100644
--- a/dev-util/cmake/patches/cmake-3.9.5.patchset
+++ b/dev-util/cmake/patches/cmake-3.9.5.patchset
@@ -1,4 +1,4 @@
-From c1df6ded8f25de8d24b5702de3f06e7c9b46739f Mon Sep 17 00:00:00 2001
+From eb5b1b21f9add5bccec9dd1d0df8db7f01dd7e8f Mon Sep 17 00:00:00 2001
 From: Adrien Destugues <pulkomandy@pulkomandy.tk>
 Date: Mon, 9 Jun 2014 22:30:55 +0200
 Subject: Fix OpenAL search path.
@@ -18,10 +18,10 @@ index c3d202e..734f5f0 100644
    ~/Library/Frameworks
    /Library/Frameworks
 -- 
-2.13.1
+2.16.1
 
 
-From ee4a048bbba1c19493fe62df965be1cf262a0653 Mon Sep 17 00:00:00 2001
+From 4db31de672c0607d1174fad544a8d72beb538e09 Mon Sep 17 00:00:00 2001
 From: Jerome Duval <jerome.duval@gmail.com>
 Date: Sat, 21 Nov 2015 22:02:38 +0000
 Subject: Haiku provides elf.h now.
@@ -73,5 +73,28 @@ index fc97bf3..5706f31 100644
  #if defined(__sun)
  #include <sys/link.h> // For dynamic section information
 -- 
-2.13.1
+2.16.1
+
+
+From 1fb2f9944d670e829608044f51cf9af6a1ab9b5e Mon Sep 17 00:00:00 2001
+From: Adrien Destugues <pulkomandy@pulkomandy.tk>
+Date: Sat, 24 Mar 2018 14:19:43 +0100
+Subject: Fix search path for Lua headers.
+
+
+diff --git a/Modules/FindLua51.cmake b/Modules/FindLua51.cmake
+index f2b2322..e127ba7 100644
+--- a/Modules/FindLua51.cmake
++++ b/Modules/FindLua51.cmake
+@@ -36,7 +36,7 @@
+ find_path(LUA_INCLUDE_DIR lua.h
+   HINTS
+     ENV LUA_DIR
+-  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include
++  PATH_SUFFIXES include/lua51 include/lua5.1 include/lua-5.1 include/lua include lua5.1
+   PATHS
+   ~/Library/Frameworks
+   /Library/Frameworks
+-- 
+2.16.1