diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6ded9c07..f575e953 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -19,11 +19,12 @@ option(ENABLE_SQLITE3 "Build with SQLite3 support" ON)
 option(ENABLE_MYSQL "Build with MySQL support" ON)
 option(ENABLE_PQXX "Build with Postgres supoort" ON)
 
-#option(ENABLE_FROTZ "Build Frotz plugin" ON)
+option(ENABLE_FROTZ "Build Frotz plugin" ON)
 option(ENABLE_IRC "Build IRC plugin" ON)
 option(ENABLE_PURPLE "Build Libpurple plugin" ON)
 option(ENABLE_SMSTOOLS3 "Build SMSTools3 plugin" ON)
 option(ENABLE_SKYPE "Build Skype plugin" ON)
+option(ENABLE_SWIFTEN "Build Swiften plugin" ON)
 option(ENABLE_TWITTER "Build Twitter plugin" ON)
 option(ENABLE_YAHOO2 "Build Libyahoo2 plugin" ON)
 
@@ -358,7 +359,11 @@ if (PROTOBUF_FOUND)
 	endif()
 
 	if (NOT WIN32)
-		message("Frotz plugin      : yes")
+		if(ENABLE_FROTZ)
+			message("Frotz plugin      : yes")
+		else()
+			message("Frotz plugin      : no (user disabled)")
+		endif()
 		if(ENABLE_SMSTOOLS3)
 			message("SMSTools3 plugin  : yes")
 		else()
@@ -397,7 +402,11 @@ if (PROTOBUF_FOUND)
 		endif()
  	endif()
 
-	message("Swiften plugin    : yes")
+	if(ENABLE_SWIFTEN)
+		message("Swiften plugin    : yes")
+	else()
+		message("Swiften plugin    : no (user disabled)")
+	endif()
 else()
 	message("Network plugins   : no (install libprotobuf-dev)")
 	message("Libpurple plugin  : no (install libpurple and libprotobuf-dev)")
diff --git a/backends/CMakeLists.txt b/backends/CMakeLists.txt
index fb4ca0e2..70918f94 100644
--- a/backends/CMakeLists.txt
+++ b/backends/CMakeLists.txt
@@ -7,25 +7,27 @@ if (PROTOBUF_FOUND)
 		ADD_SUBDIRECTORY(libcommuni)
 	endif()
 
-	ADD_SUBDIRECTORY(swiften)
+	if (ENABLE_SWIFTEN)
+		ADD_SUBDIRECTORY(swiften)
+	endif()
 
 	ADD_SUBDIRECTORY(template)
 
-
-if (NOT WIN32)
-	if(ENABLE_SMSTOOLS3)
-		ADD_SUBDIRECTORY(smstools3)
-	endif()
-	ADD_SUBDIRECTORY(frotz)
- 	if(YAHOO2_FOUND)
-		ADD_SUBDIRECTORY(libyahoo2)
- 	endif()
-	if(ENABLE_TWITTER)
-		ADD_SUBDIRECTORY(twitter)
-	endif()
-	if (${LIBDBUSGLIB_FOUND})
-		ADD_SUBDIRECTORY(skype)
+	if (NOT WIN32)
+		if(ENABLE_SMSTOOLS3)
+			ADD_SUBDIRECTORY(smstools3)
+		endif()
+		if(ENABLE_FROTZ)
+			ADD_SUBDIRECTORY(frotz)
+		endif()
+ 		if(YAHOO2_FOUND)
+			ADD_SUBDIRECTORY(libyahoo2)
+	 	endif()
+		if(ENABLE_TWITTER)
+			ADD_SUBDIRECTORY(twitter)
+		endif()
+		if (${LIBDBUSGLIB_FOUND})
+			ADD_SUBDIRECTORY(skype)
+		endif()
 	endif()
 endif()
-
-endif()