diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e1026a4..7c1afa4b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -9,32 +9,32 @@
 #
 # Our project is called 'kicad'. This is what it will be called in
 # our makefiles.
-PROJECT(kicad)
+project(kicad)
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.4.6 FATAL_ERROR)
+cmake_minimum_required(VERSION 2.4.6 FATAL_ERROR)
 
 # Locations for install targets.
-IF(UNIX)
-    IF(APPLE)
-    ELSE(APPLE)
+if(UNIX)
+    if(APPLE)
+    else(APPLE)
         # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
-        SET(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "")
+        set(CMAKE_INSTALL_PREFIX /usr/local CACHE PATH "")
         # When used later, "bin" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
-        SET(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.")
-        SET(KICAD_MODULES ${KICAD_DATA}/modules)
-        SET(KICAD_LIBRARY ${KICAD_DATA}/library)
-    ENDIF(APPLE)
-ENDIF(UNIX)
+        set(KICAD_DATA share/kicad CACHE PATH "Location of KiCad data files.")
+        set(KICAD_MODULES ${KICAD_DATA}/modules)
+        set(KICAD_LIBRARY ${KICAD_DATA}/library)
+    endif(APPLE)
+endif(UNIX)
 
-IF(WIN32)
+if(WIN32)
     # Like all variables, CMAKE_INSTALL_PREFIX can be over-ridden on the command line.
-    SET(CMAKE_INSTALL_PREFIX c:/kicad CACHE PATH "")
+    set(CMAKE_INSTALL_PREFIX c:/kicad CACHE PATH "")
     # When used later, "winexe" and others with no leading / is relative to CMAKE_INSTALL_PREFIX.
-    SET(KICAD_MODULES modules)
-    SET(KICAD_LIBRARY library)
-ENDIF(WIN32)
+    set(KICAD_MODULES modules)
+    set(KICAD_LIBRARY library)
+endif(WIN32)
 
 # CMake will look in these dirs for nested 'CMakeLists.txt' files.
 # Resources.
-ADD_SUBDIRECTORY(library)
-ADD_SUBDIRECTORY(modules)
+add_subdirectory(library)
+add_subdirectory(modules)
diff --git a/library/CMakeLists.txt b/library/CMakeLists.txt
index 888b6a12..2a01d515 100644
--- a/library/CMakeLists.txt
+++ b/library/CMakeLists.txt
@@ -1,7 +1,7 @@
-FILE(GLOB dcm_files "*.dcm")
-FILE(GLOB lib_files "*.lib")
-FILE(GLOB sym_files "*.sym")
+file(GLOB dcm_files "*.dcm")
+file(GLOB lib_files "*.lib")
+file(GLOB sym_files "*.sym")
 
-INSTALL(FILES ${dcm_files} DESTINATION ${KICAD_LIBRARY} COMPONENT resources)
-INSTALL(FILES ${lib_files} DESTINATION ${KICAD_LIBRARY} COMPONENT resources)
-INSTALL(FILES ${sym_files} DESTINATION ${KICAD_LIBRARY} COMPONENT resources)
+install(FILES ${dcm_files} DESTINATION ${KICAD_LIBRARY} COMPONENT resources)
+install(FILES ${lib_files} DESTINATION ${KICAD_LIBRARY} COMPONENT resources)
+install(FILES ${sym_files} DESTINATION ${KICAD_LIBRARY} COMPONENT resources)
diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
index 4f18c5a9..89c2ffe1 100644
--- a/modules/CMakeLists.txt
+++ b/modules/CMakeLists.txt
@@ -1,12 +1,12 @@
-FILE(GLOB brd_files "*.brd")
-FILE(GLOB equ_files "*.equ")
-FILE(GLOB mdc_files "*.mdc")
-FILE(GLOB mod_files "*.mod")
+file(GLOB brd_files "*.brd")
+file(GLOB equ_files "*.equ")
+file(GLOB mdc_files "*.mdc")
+file(GLOB mod_files "*.mod")
 
-INSTALL(FILES ${brd_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
-INSTALL(FILES ${equ_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
-INSTALL(FILES ${mdc_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
-INSTALL(FILES ${mod_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
+install(FILES ${brd_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
+install(FILES ${equ_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
+install(FILES ${mdc_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
+install(FILES ${mod_files} DESTINATION ${KICAD_MODULES} COMPONENT resources)
 
-INSTALL(DIRECTORY packages3d DESTINATION ${KICAD_MODULES} COMPONENT resources
+install(DIRECTORY packages3d DESTINATION ${KICAD_MODULES} COMPONENT resources
     PATTERN ".svn" EXCLUDE)