diff --git a/CMakeLists.txt b/CMakeLists.txt
index 86e24eb9f..6e454b9ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,10 +7,10 @@
 #     find -name '*.cmake' -exec grep -E 'TODO|FIXME' {} +
 #     find -name CMakeLists.txt -exec grep -E 'TODO|FIXME' {} +
 
-cmake_minimum_required(VERSION 2.8.12.2 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.3 FATAL_ERROR)
 
-if(CMAKE_CROSSCOMPILING AND NOT KATIE_CROSS_EXEC)
-    message(FATAL_ERROR "Cross-compiling requires KATIE_CROSS_EXEC to be set to QEMU executable, e.g. qemu-arm-static")
+if(CMAKE_CROSSCOMPILING AND NOT CMAKE_CROSSCOMPILING_EMULATOR)
+    message(FATAL_ERROR "Cross-compiling requires CMAKE_CROSSCOMPILING_EMULATOR to be set to QEMU executable, e.g. qemu-arm-static")
 endif()
 
 project(Katie C CXX)
@@ -32,15 +32,7 @@ set(CMAKE_VISIBILITY_INLINES_HIDDEN ON)
 set(CMAKE_INCLUDE_DIRECTORIES_BEFORE ON)
 
 # enable symbols visibility preset for all targets
-if(NOT CMAKE_VERSION VERSION_LESS "3.3.0")
-    cmake_policy(SET CMP0063 NEW)
-endif()
-
-# set CMAKE_CROSSCOMPILING_EMULATOR so that manually specifying cache variables for the tests done
-# via katie_check_proc() is not required, CMAKE_CROSSCOMPILING_EMULATOR is supported by CMake v3.3+
-if(KATIE_CROSS_EXEC AND NOT CMAKE_CROSSCOMPILING_EMULATOR)
-    set(CMAKE_CROSSCOMPILING_EMULATOR "${KATIE_CROSS_EXEC}")
-endif()
+cmake_policy(SET CMP0063 NEW)
 
 # LLVM linker does not have a default library search path, add some directories known to contain
 # system wide libraries. the headers search path is also incomplete
diff --git a/cmake/dbus.sh.cmake b/cmake/dbus.sh.cmake
index 252d04bf9..dd9ca2a02 100644
--- a/cmake/dbus.sh.cmake
+++ b/cmake/dbus.sh.cmake
@@ -15,6 +15,6 @@ shift
 
 cd "$(dirname "$bin")"
 if [ -z "$DBUS_SESSION_BUS_ADDRESS" ];then
-    exec dbus-run-session -- @KATIE_CROSS_EXEC@ "./$(basename "$bin")" $@
+    exec dbus-run-session -- @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" $@
 fi
-exec @KATIE_CROSS_EXEC@ "./$(basename "$bin")" $@
+exec @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" $@
diff --git a/cmake/exec.sh.cmake b/cmake/exec.sh.cmake
index 5a721bf45..ba887e409 100644
--- a/cmake/exec.sh.cmake
+++ b/cmake/exec.sh.cmake
@@ -14,4 +14,4 @@ bin="$1"
 shift
 
 cd "$(dirname "$bin")"
-exec @KATIE_CROSS_EXEC@ "./$(basename "$bin")" $@
+exec @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" $@
diff --git a/cmake/xvfb.sh.cmake b/cmake/xvfb.sh.cmake
index 8816e7758..32050323c 100644
--- a/cmake/xvfb.sh.cmake
+++ b/cmake/xvfb.sh.cmake
@@ -19,10 +19,10 @@ if [ -z "$DISPLAY" ];then
     xvfbpid=$!
     sleep 5
 
-    DISPLAY=:123 @KATIE_CROSS_EXEC@ "./$(basename "$bin")" $@
+    DISPLAY=:123 @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" $@
     retval=$?
 
     kill $xvfbpid
     exit $retval
 fi
-exec @KATIE_CROSS_EXEC@ "./$(basename "$bin")" $@
+exec @CMAKE_CROSSCOMPILING_EMULATOR@ "./$(basename "$bin")" $@
diff --git a/mkspecs/mkspecs.cmake b/mkspecs/mkspecs.cmake
index e34be9b03..84c57aa55 100644
--- a/mkspecs/mkspecs.cmake
+++ b/mkspecs/mkspecs.cmake
@@ -68,7 +68,5 @@ if(NOT trycompilestandardpolicy EQUAL NEW)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11")
     endif()
 endif()
-if(NOT CMAKE_VERSION VERSION_LESS "3.1.0")
-    set(CMAKE_CXX_STANDARD_REQUIRED ON)
-    set(CMAKE_CXX_STANDARD 11)
-endif()
+set(CMAKE_CXX_STANDARD_REQUIRED ON)
+set(CMAKE_CXX_STANDARD 11)
diff --git a/package/debian/rules b/package/debian/rules
index 225c97aa1..d1281cff5 100755
--- a/package/debian/rules
+++ b/package/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
-KATIE_CROSS_EXEC=""
+KATIE_CROSS_EMULATOR=""
 ifneq ($(DEB_HOST_ARCH_CPU),$(DEB_BUILD_ARCH_CPU))
-	KATIE_CROSS_EXEC="qemu-$(DEB_HOST_GNU_CPU)-static"
+	KATIE_CROSS_EMULATOR="qemu-$(DEB_HOST_GNU_CPU)-static"
 endif
 
 KATIE_BUILD_DIR="$(shell pwd)/obj-$(DEB_HOST_GNU_TYPE)"
@@ -16,7 +16,7 @@ override_dh_shlibdeps:
 override_dh_auto_configure:
 	dh_auto_configure -- -Wno-dev \
 		-DKATIE_TOOLS_SUFFIX="-katie" \
-		-DKATIE_CROSS_EXEC=$(KATIE_CROSS_EXEC)
+		-DCMAKE_CROSSCOMPILING_EMULATOR=$(KATIE_CROSS_EMULATOR)
 
 override_dh_auto_install:
 	$(MAKE) -C $(KATIE_BUILD_DIR) install-runtime DESTDIR=../debian/katie-runtime
diff --git a/scripts/oldmake.sh b/scripts/oldmake.sh
index 863dce8e8..90e12897c 100755
--- a/scripts/oldmake.sh
+++ b/scripts/oldmake.sh
@@ -3,13 +3,14 @@
 set -e
 
 cwd="$(readlink -f $(dirname $0))"
-cmake="cmake-2.8.12.2-Linux-i386"
+cmake="cmake-3.3.0-Linux-x86_64.tar.gz"
+cmakesite="https://cmake.org/files/v3.3"
 
 cd "$cwd"
 if which curl; then
-    curl -C - -L "https://cmake.org/files/v2.8/$cmake.tar.gz" -o "$cmake.tar.gz"
+    curl -C - -L "$cmakesite/$cmake.tar.gz" -o "$cmake.tar.gz"
 else
-    wget -c "https://cmake.org/files/v2.8/$cmake.tar.gz"
+    wget -c "$cmakesite/$cmake.tar.gz"
 fi
 
 rm -rf "$cwd/../oldmake"