diff --git a/Makefile b/Makefile
index 0305d249b6..6b1522d61e 100644
--- a/Makefile
+++ b/Makefile
@@ -898,7 +898,7 @@ mxml/libmxml.a:
 	@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
 	$(MAKE) -C mxml libmxml.a
 
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(wildcard $(dir)/*.c) $(wildcard $(dir)/*.cc)) build_tools/cflags.xml sounds/sounds.xml
 	@echo "Generating list of available modules ..."
 	@build_tools/prep_moduledeps 2>/dev/null > $@
 
diff --git a/apps/app_voicemail.c b/apps/app_voicemail.c
index ebb26ffd2c..657945b235 100644
--- a/apps/app_voicemail.c
+++ b/apps/app_voicemail.c
@@ -54,6 +54,7 @@
 	</member>
 	<member name="IMAP_STORAGE" displayname="Storage of Voicemail using IMAP4">
 		<depend>imap_tk</depend>
+		<use>ssl</use>
 		<defaultenabled>no</defaultenabled>
 	</member>
 </category>
diff --git a/pbx/Makefile b/pbx/Makefile
index 19fb905c40..747843ff4b 100644
--- a/pbx/Makefile
+++ b/pbx/Makefile
@@ -14,10 +14,12 @@ ifneq ($(wildcard ../menuselect.makeopts),)
   include ../menuselect.makedeps
 endif
 
-SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)))
+SELECTED_MODS:=$(filter-out $(MENUSELECT_PBX),$(patsubst %.c,%,$(wildcard pbx_*.c)) $(patsubst %.cc,%,$(wildcard pbx_*.cc)))
 
 MODS:=$(patsubst %,%.so,$(SELECTED_MODS))
 
+CC_MODS:=pbx_kdeconsole
+
 all: _all
 
 include $(ASTTOPDIR)/Makefile.moddir_rules
diff --git a/pbx/pbx_kdeconsole.cc b/pbx/pbx_kdeconsole.cc
index 10a3f289f7..4a9af64d3f 100644
--- a/pbx/pbx_kdeconsole.cc
+++ b/pbx/pbx_kdeconsole.cc
@@ -13,6 +13,7 @@
 
 /*** MODULEINFO
 	<depend>qt</depend>
+	<defaultenabled>no</defaultenabled>
  ***/
 
 #include "pbx_kdeconsole.moc"