diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1a14ec5cb..286cb1ba13 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -61,41 +61,39 @@ link_directories(wiretap)
 add_executable(dumpcap ${dumpcap_FILES})
 
 option(BUILD_WITH_GLIB2 "Build using gtk2/glib2 instead of gtk/glib" ON)
-option(BUILD_WIRESHARK  "Build the GUI version of Wireshark" OFF)
-option(ENABLE_STATIC	"Build a static version of Wireshark" ON)
+option(BUILD_WIRESHARK  "Build the GUI version of Wireshark" ON)
+option(ENABLE_STATIC	"Build a static version of Wireshark" OFF)
 
 if (BUILD_WITH_GLIB2)
 	if (BUILD_WIRESHARK)
-		find_package(GTK2)
+		find_package(GTK2 REQUIRED)
 		if (GTK2_FOUND)
 			message(GTK2_FOUND)
 			include_directories(${GTK2_INCLUDE_DIR})
-			set(dumpcap_LIBS ${dumpcap_LIBS} ${GTK2_LIBRARIES})
+			# set(dumpcap_LIBS ${dumpcap_LIBS} ${GTK2_LIBRARIES})
 		endif (GTK2_FOUND)
-	else (BUILD_WIRESHARK)
-		find_package(GLIB2)
-		if (GLIB2_FOUND)
-			message(GLIB2_FOUND)
-			include_directories(${GLIB2_INCLUDE_DIR})
-			set(dumpcap_LIBS ${dumpcap_LIBS} ${GLIB2_LIBRARIES})
-		endif (GLIB2_FOUND)
 	endif (BUILD_WIRESHARK)
+	find_package(GLIB2 REQUIRED)
+	if (GLIB2_FOUND)
+		message(GLIB2_FOUND)
+		include_directories(${GLIB2_INCLUDE_DIR})
+		set(dumpcap_LIBS ${dumpcap_LIBS} ${GLIB2_glib_LIBRARY})
+	endif (GLIB2_FOUND)
 else (BUILD_WITH_GLIB2)
 	if (BUILD_WIRESHARK)
-		find_package(GTK)
+		find_package(GTK REQUIRED)
 		if (GTK_FOUND)
 			message(GTK_FOUND)
 			include_directories(${GTK_INCLUDE_DIR})
-			set(dumpcap_LIBS ${dumpcap_LIBS} ${GTK_LIBRARIES})
+			# set(dumpcap_LIBS ${dumpcap_LIBS} ${GTK_LIBRARIES})
 		endif (GTK_FOUND)
-	else (BUILD_WIRESHARK)
-		find_package(GLIB REQUIRED)
-		if (GLIB_FOUND)
-			message(GLIB_FOUND)
-			include_directories(${GLIB_INCLUDE_DIR})
-			set(dumpcap_LIBS ${dumpcap_LIBS} ${GLIB_LIBRARIES})
-		endif (GLIB_FOUND)
 	endif (BUILD_WIRESHARK)
+	find_package(GLIB REQUIRED)
+	if (GLIB_FOUND)
+		message(GLIB_FOUND)
+		include_directories(${GLIB_INCLUDE_DIR})
+		set(dumpcap_LIBS ${dumpcap_LIBS} ${GLIB_glib_LIBRARIES})
+	endif (GLIB_FOUND)
 endif (BUILD_WITH_GLIB2)
 
 set(PACKAGELIST ZLIB PCAP)
diff --git a/cmake/modules/FindGTK2.cmake b/cmake/modules/FindGTK2.cmake
index f0d6d9be1b..c426b24303 100644
--- a/cmake/modules/FindGTK2.cmake
+++ b/cmake/modules/FindGTK2.cmake
@@ -286,7 +286,9 @@ ELSE (GTK2_LIBRARIES AND GTK2_INCLUDE_DIRS)
                         ${GTK2_LIBRARIES}
                         ${GTK2_GTHREAD_LIBRARY}
                       )
-                    SET(GTK2_LIBRARIES ${GTK2_LIBRARIES} CACHE INTERNAL "The libraries for GTK2"
+                    SET(GTK2_LIBRARIES ${GTK2_LIBRARIES}
+			CACHE INTERNAL "The libraries for GTK2"
+		    )
                     ENDIF(GTK2_GTHREAD_LIBRARY)
                   ELSE(GTK2_CAIRO_INCLUDE_PATH)
                     MESSAGE(STATUS "Can not find cairo")