diff --git a/README.md b/README.md
index 5065125c..26666bb6 100644
--- a/README.md
+++ b/README.md
@@ -70,13 +70,9 @@ Since, DVM Host 3.5, the old calibration and setup modes have been deprecated in
 
 ### Compiled Protocol Options
 
-These are the protocols that are compiled-in to the host for data processing. By default, support for DMR, P25 and NXDN protocols are enabled. What "compiled-in" support means is whether or not the host will perform _any_ processing for the specified protocol (and this is regardless of whether or not the `config.yml` has a protocol specified for being enabled or not).
+Support for DMR, P25 and NXDN protocols are enabled out of the box. What "compiled-in" support means is whether or not the host will perform _any_ processing for the specified protocol (and this is regardless of whether or not the `config.yml` has a protocol specified for being enabled or not).
 
-In order to change what protocol support is compiled into the host, these are the CMake options to supply:
-
-- `-DENABLE_DMR=1` - This will enable compiled-in DMR protocol support.
-- `-DENABLE_P25=1` - This will enable compiled-in P25 protocol support.
-- `-DENABLE_NXDN=1` - This will enable compiled-in NXDN protocol support.
+The abiliy to enable/disable protocols was removed in 3.6.
 
 ## Configuration
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fe6adfe5..2213c70d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -100,29 +100,14 @@ file(GLOB common_INCLUDE
 )
 
 # Digital mode options and other compilation features
-option(ENABLE_DMR "Enable DMR Digtial Mode" on)
-if (ENABLE_DMR)
-    add_definitions(-DENABLE_DMR)
-    message(CHECK_START "DMR Digital Mode - enabled")
-else ()
-    message(CHECK_START "DMR Digital Mode - disabled")
-endif (ENABLE_DMR)
+add_definitions(-DENABLE_DMR)
+message(CHECK_START "DMR Digital Mode - enabled")
 
-option(ENABLE_P25 "Enable P25 Digital Mode" on)
-if (ENABLE_P25)
-    add_definitions(-DENABLE_P25)
-    message(CHECK_START "P25 Digital Mode - enabled")
-else ()
-    message(CHECK_START "P25 Digital Mode - disabled")
-endif (ENABLE_P25)
+add_definitions(-DENABLE_P25)
+message(CHECK_START "P25 Digital Mode - enabled")
 
-option(ENABLE_NXDN "Enable NXDN Digital Mode" on)
-if (ENABLE_NXDN)
-    add_definitions(-DENABLE_NXDN)
-    message(CHECK_START "NXDN Digital Mode - enabled")
-else ()
-    message(CHECK_START "NXDN Digital Mode - disabled")
-endif (ENABLE_NXDN)
+add_definitions(-DENABLE_NXDN)
+message(CHECK_START "NXDN Digital Mode - enabled")
 
 if (ENABLE_TUI_SUPPORT)
     option(ENABLE_SETUP_TUI "Enable interactive setup TUI" on)