diff --git a/CMakeLists.txt b/CMakeLists.txt
index d8a49e8..57c11cc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -27,14 +27,6 @@ ELSE(NOT BEOS)
     PROJECT(MojoSetup CXX)
 ENDIF(NOT BEOS)
 
-# !!! FIXME: correct this to new policy and bump minimum cmake requirement.
-IF(COMMAND CMAKE_POLICY)
-    # Use old policy when it comes to escaping macros,
-    # Specifically the one in quotes below.
-    CMAKE_POLICY(SET CMP0005 OLD)
-ENDIF(COMMAND CMAKE_POLICY)
-
-
 EXECUTE_PROCESS(
     COMMAND hg tip --template hg-{rev}:{node|short}
     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
@@ -92,13 +84,13 @@ IF(NOT MOJOSETUP_HAVE_RESTRICT_KEYWORD)
     #IF(MOJOSETUP_HAVE_GNU_RESTRICT_KEYWORD)
     #    ADD_DEFINITIONS(-Drestrict=__restrict__)
     #ELSE(MOJOSETUP_HAVE_GNU_RESTRICT_KEYWORD)
-        ADD_DEFINITIONS("-Drestrict=\"\"")
+        ADD_DEFINITIONS(-Drestrict="")
     #ENDIF(MOJOSETUP_HAVE_GNU_RESTRICT_KEYWORD)
 ENDIF(NOT MOJOSETUP_HAVE_RESTRICT_KEYWORD)
 
 ADD_DEFINITIONS(-D__MOJOSETUP__=1)
 ADD_DEFINITIONS(-DAPPID=mojosetup)
-ADD_DEFINITIONS(-DAPPREV="${MOJOSETUP_VERSION}")
+ADD_DEFINITIONS(-DAPPREV=${MOJOSETUP_VERSION})
 ADD_DEFINITIONS(-D_REENTRANT)
 ADD_DEFINITIONS(-D_THREAD_SAFE)