diff --git a/CMakeLists.txt b/CMakeLists.txt
index ef893fe472..fa4aba144f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,45 +189,43 @@ install(FILES freeroute.jnlp
 # Install scripts
 ###
 if(UNIX)
-	install(DIRECTORY scripts
-		DESTINATION ${KICAD_DOCS}
-		COMPONENT resources
-		PATTERN ".svn" EXCLUDE)
+    install(DIRECTORY scripts
+            DESTINATION ${KICAD_DOCS}
+            COMPONENT resources
+            PATTERN ".svn" EXCLUDE)
 endif(UNIX)
 ###
 # FreeDesktop .desktop and MIME resources
 ###
 if(UNIX)
-	
-	# Set paths
-	set(UNIX_MIME_DIR 		resources/linux/mime)
-	set(UNIX_MIMELNK_FILES		${UNIX_MIME_DIR}/mimelnk)
-	set(UNIX_MIME_FILES		${UNIX_MIME_DIR}/mime)
-	set(UNIX_ICONS_FILES		${UNIX_MIME_DIR}/icons)
-	set(UNIX_APPLICATIONS_FILES	${UNIX_MIME_DIR}/applications)
+    # Set paths
+    set(UNIX_MIME_DIR resources/linux/mime)
+    set(UNIX_MIMELNK_FILES ${UNIX_MIME_DIR}/mimelnk)
+    set(UNIX_MIME_FILES ${UNIX_MIME_DIR}/mime)
+    set(UNIX_ICONS_FILES ${UNIX_MIME_DIR}/icons)
+    set(UNIX_APPLICATIONS_FILES ${UNIX_MIME_DIR}/applications)
 
-	# Install Mimelnk directory
-	install(DIRECTORY ${UNIX_MIMELNK_FILES}
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share
-		COMPONENT resources
-		PATTERN ".svn" EXCLUDE)
+    # Install Mimelnk directory
+    install(DIRECTORY ${UNIX_MIMELNK_FILES}
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/share
+            COMPONENT resources
+            PATTERN ".svn" EXCLUDE)
 
-	# Install Mime directory
-	install(DIRECTORY ${UNIX_ICONS_FILES}
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share
-		COMPONENT resources
-		PATTERN ".svn" EXCLUDE)
+    # Install Mime directory
+    install(DIRECTORY ${UNIX_ICONS_FILES}
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/share
+            COMPONENT resources
+            PATTERN ".svn" EXCLUDE)
 
-	# Install Icons
-	install(DIRECTORY ${UNIX_MIME_FILES}
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share
-		COMPONENT resources
-		PATTERN ".svn" EXCLUDE)
-
-	# Install Applications directory (.desktop files)
-	install(DIRECTORY ${UNIX_APPLICATIONS_FILES}
-		DESTINATION ${CMAKE_INSTALL_PREFIX}/share
-		COMPONENT resources
-		PATTERN ".svn" EXCLUDE)
+    # Install Icons
+    install(DIRECTORY ${UNIX_MIME_FILES}
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/share
+            COMPONENT resources
+            PATTERN ".svn" EXCLUDE)
 
+    # Install Applications directory (.desktop files)
+    install(DIRECTORY ${UNIX_APPLICATIONS_FILES}
+            DESTINATION ${CMAKE_INSTALL_PREFIX}/share
+            COMPONENT resources
+            PATTERN ".svn" EXCLUDE)
 endif(UNIX)
diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt
index 030ab1e94b..298d655c51 100644
--- a/common/CMakeLists.txt
+++ b/common/CMakeLists.txt
@@ -16,8 +16,8 @@ set(COMMON_SRCS
     common_plot_functions.cpp
     common_plotHPGL_functions.cpp
     common_plotPS_functions.cpp
-	common_plotGERBER_functions.cpp
-	confirm.cpp
+    common_plotGERBER_functions.cpp
+    confirm.cpp
     copy_to_clipboard.cpp
     dcsvg.cpp
     displlst.cpp
diff --git a/eeschema/CMakeLists.txt b/eeschema/CMakeLists.txt
index 88c42f191b..07ff890f0d 100644
--- a/eeschema/CMakeLists.txt
+++ b/eeschema/CMakeLists.txt
@@ -36,9 +36,9 @@ set(EESCHEMA_SRCS
     delete.cpp
     delsheet.cpp
 #   dialog_backanno.cpp
-	dialog_bodygraphictext_properties_base.cpp
+    dialog_bodygraphictext_properties_base.cpp
     dialog_build_BOM.cpp
-	dialog_build_BOM_base.cpp
+    dialog_build_BOM_base.cpp
 #   dialog_cmp_graphic_properties.cpp
     dialog_create_component.cpp
 #   dialog_edit_component_in_lib.cpp
@@ -53,7 +53,7 @@ set(EESCHEMA_SRCS
     dialog_erc.cpp
 #   dialog_find.cpp
     dialog_options.cpp
-	dialog_print_using_printer_base.cpp
+    dialog_print_using_printer_base.cpp
     dialog_print_using_printer.cpp
     dialog_SVG_print.cpp
     dialog_SVG_print_base.cpp
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index a2597aeb05..e89f1c9e6f 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -34,22 +34,22 @@ set(PCBNEW_SRCS
     dialog_copper_zones_base.cpp
     dialog_display_options.cpp
     dialog_display_options_base.cpp
-	dialog_drc_base.cpp
+    dialog_drc_base.cpp
     dialog_drc.cpp
     dialog_edit_module_text.cpp
-	dialog_edit_module_text_base.cpp
+    dialog_edit_module_text_base.cpp
     dialog_edit_module.cpp
     dialog_exchange_modules_base.cpp
     dialog_freeroute_exchange.cpp
 #   dialog_gendrill.cpp
     dialog_general_options.cpp
-	dialog_general_options_BoardEditor_base.cpp
+    dialog_general_options_BoardEditor_base.cpp
 #   dialog_graphic_items_options.cpp
-	dialog_graphic_item_properties.cpp
-	dialog_graphic_item_properties_base.cpp
+    dialog_graphic_item_properties.cpp
+    dialog_graphic_item_properties_base.cpp
 #   dialog_initpcb.cpp
     dialog_netlist.cpp
-	dialog_netlist_fbp.cpp
+    dialog_netlist_fbp.cpp
     dialog_pcb_text_properties.cpp
     zones_non_copper_type_functions.cpp
     dialog_non_copper_zones_properties_base.cpp
@@ -74,7 +74,7 @@ set(PCBNEW_SRCS
     editmod.cpp
     editrack.cpp
     editrack-part2.cpp
-	edit_pcb_text.cpp
+    edit_pcb_text.cpp
     edit_track_width.cpp
     edtxtmod.cpp
     export_gencad.cpp
diff --git a/polygon/kbool/src/CMakeLists.txt b/polygon/kbool/src/CMakeLists.txt
index f35d688bf8..d16b6a5095 100644
--- a/polygon/kbool/src/CMakeLists.txt
+++ b/polygon/kbool/src/CMakeLists.txt
@@ -1,8 +1,8 @@
-IF(WIN32)
-    ADD_DEFINITIONS( -D_MSWVC_ )
-ELSE(WIN32)
-    ADD_DEFINITIONS( -D__UNIX__  )
-ENDIF(WIN32)
+if(WIN32)
+    add_definitions(-D_MSWVC_)
+else(WIN32)
+    add_definitions(-D__UNIX__)
+endif(WIN32)
 
 
 include_directories(../include)