diff --git a/CMakeLists.txt b/CMakeLists.txt
index 536611e7..9269f48a 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -21,11 +21,12 @@ SET ( DEFAULT_X11        OFF )
 SET ( DEFAULT_SPIDEV     OFF )
 SET ( DEFAULT_WS2812BPWM OFF )
 SET ( DEFAULT_WS281XPWM  OFF )
-SET ( DEFAULT_ZEROCONF   ON )
+SET ( DEFAULT_V4l2       ON )
 SET ( DEFAULT_USE_SHARED_AVAHI_LIBS  OFF )
 
 if (APPLE)
-	SET ( DEFAULT_OSX ON )
+	SET ( DEFAULT_OSX  ON )
+	SET ( DEFAULT_V4l2 OFF )
 else ()
 	if ( "${PLATFORM}" STREQUAL "rpi" )
 		SET ( DEFAULT_DISPMANX   ON )
@@ -48,8 +49,6 @@ else ()
 endif ()
 
 # set the build options
-SET(ENABLE_ZEROCONF ON )
-
 option(ENABLE_AMLOGIC "Enable the AMLOGIC video grabber" ${DEFAULT_AMLOGIC} )
 message(STATUS "ENABLE_AMLOGIC = " ${ENABLE_AMLOGIC})
 
@@ -68,7 +67,7 @@ message(STATUS "ENABLE_SPIDEV   = " ${ENABLE_SPIDEV})
 option(ENABLE_TINKERFORGE "Enable the TINKERFORGE device" ON)
 message(STATUS "ENABLE_TINKERFORGE = " ${ENABLE_TINKERFORGE})
 
-option(ENABLE_V4L2 "Enable the V4L2 grabber" ON)
+option(ENABLE_V4L2 "Enable the V4L2 grabber" ${DEFAULT_V4L2})
 message(STATUS "ENABLE_V4L2 = " ${ENABLE_V4L2})
 
 option(ENABLE_WS2812BPWM   "Enable the WS2812b-PWM device" ${DEFAULT_WS2812BPWM} )
diff --git a/HyperionConfig.h.in b/HyperionConfig.h.in
index 20d6c2b6..641cdd72 100644
--- a/HyperionConfig.h.in
+++ b/HyperionConfig.h.in
@@ -27,9 +27,6 @@
 // Define to enable the osx grabber
 #cmakedefine ENABLE_OSX
 
-// Define to enable the bonjour/zeroconf publishing
-#cmakedefine ENABLE_ZEROCONF
-
 // Define to enable profiler for development purpose
 #cmakedefine ENABLE_PROFILER