diff --git a/3d-viewer/CMakeLists.txt b/3d-viewer/CMakeLists.txt
index 167cbde0fd..53dec89c60 100644
--- a/3d-viewer/CMakeLists.txt
+++ b/3d-viewer/CMakeLists.txt
@@ -1,4 +1,3 @@
-
 FIND_PACKAGE(OpenGL REQUIRED)
 IF(OPENGL_FOUND)
 	MESSAGE(STATUS "Check for installed OpenGL -- found")
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f14e39ad70..0db69bd316 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,6 +21,8 @@ SET(CMAKE_EXE_LINKER_FLAGS_RELEASE "-s")
 # http://www.wxwidgets.org/manuals/2.8/wx_librarieslist.html
 SET(wxWidgets_USE_LIBS base core adv gl html net)
 
+# OpenGL support
+SET(WXWINDOWS_USE_GL 1)
 # We need the Find package for wxWidgets to work.
 FIND_PACKAGE(wxWidgets REQUIRED)
 
diff --git a/kicad/minizip/CMakeLists.txt b/kicad/minizip/CMakeLists.txt
index b78a250c90..3840eba2b8 100644
--- a/kicad/minizip/CMakeLists.txt
+++ b/kicad/minizip/CMakeLists.txt
@@ -1,18 +1,18 @@
-FIND_PACKAGE(ZLIB)
-
+FIND_PACKAGE(ZLIB REQUIRED)
 IF(ZLIB_FOUND)
 	MESSAGE(STATUS "Check for installed ZLIB -- found")
-	SET(MINIZIP_SRCS
-		ioapi.c
-		minizip.c
-		zip.c)
-
-	ADD_EXECUTABLE(minizip ${MINIZIP_SRCS} )
-
-	TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES})
-
-	INSTALL(TARGETS minizip RUNTIME DESTINATION bin)
 ELSE(ZLIB_FOUND)
 	MESSAGE(STATUS "Check for installed zlib -- not found")
 	MESSAGE(FATAL_ERROR "zlib was not found - it is required to build KiCad")
 ENDIF(ZLIB_FOUND)
+
+SET(MINIZIP_SRCS
+	ioapi.c
+	minizip.c
+	zip.c)
+
+ADD_EXECUTABLE(minizip ${MINIZIP_SRCS} )
+
+TARGET_LINK_LIBRARIES(minizip ${ZLIB_LIBRARIES})
+
+INSTALL(TARGETS minizip RUNTIME DESTINATION bin)
diff --git a/pcbnew/CMakeLists.txt b/pcbnew/CMakeLists.txt
index 5cab737000..abc743116c 100644
--- a/pcbnew/CMakeLists.txt
+++ b/pcbnew/CMakeLists.txt
@@ -133,10 +133,10 @@ SET(PCBNEW_SRCS
 	via_edit.cpp
 	work.cpp
 	xchgmod.cpp
-	zones_by_polygon.cpp
 	zone_filling_algorithm.cpp
+	zones_by_polygon.cpp
 #	zones.cpp
-	)
+	zones_test_and_combine_areas.cpp)
 
 SET(PCBNEW_EXTRA_SRCS
 	../share/drawframe.cpp