diff --git a/configure.ac b/configure.ac
index aa2289bac..595db9481 100644
--- a/configure.ac
+++ b/configure.ac
@@ -128,7 +128,6 @@ lib/libeventserver/Makefile
 lib/libmd5sum/Makefile
 lib/libnet/Makefile
 lib/xmltree/Makefile
-lib/controldclient/Makefile
 lib/sectionsdclient/Makefile
 lib/timerdclient/Makefile
 lib/libtriple/Makefile
diff --git a/src/global.h b/src/global.h
index 0f9d21170..a5daecbd6 100644
--- a/src/global.h
+++ b/src/global.h
@@ -34,7 +34,9 @@
 
 #include <zapit/client/zapitclient.h>
 
+#ifdef HAVE_CONTROLD
 #include <controldclient/controldclient.h>
+#endif
 #include <sectionsdclient/sectionsdclient.h>
 #include <timerdclient/timerdclient.h>
 
@@ -79,7 +81,9 @@
 NEUTRINO_CPP  SNeutrinoSettings	g_settings;
 NEUTRINO_CPP  SglobalInfo	g_info;
 
+#ifdef HAVE_CONTROLD
 NEUTRINO_CPP  CControldClient	*g_Controld;
+#endif
 NEUTRINO_CPP  CZapitClient	*g_Zapit;
 NEUTRINO_CPP  CSectionsdClient	*g_Sectionsd;
 NEUTRINO_CPP  CTimerdClient	*g_Timerd;
diff --git a/src/neutrino.cpp b/src/neutrino.cpp
index c52fc6804..d1704a5c2 100644
--- a/src/neutrino.cpp
+++ b/src/neutrino.cpp
@@ -2731,6 +2731,7 @@ _repeat:
 		//setVolume(msg, false, true);
 		return messages_return::handled;
 	}
+#ifdef HAVE_CONTROLD
 	else if( msg == NeutrinoMessages::EVT_VCRCHANGED ) {
 		if (g_settings.vcr_AutoSwitch) {
 			if( data != VCR_STATUS_OFF )
@@ -2740,6 +2741,7 @@ _repeat:
 		}
 		return messages_return::handled | messages_return::cancel_info;
 	}
+#endif
 	else if( msg == NeutrinoMessages::EVT_MUTECHANGED ) {
 #if 0
 		CControldMsg::commandMute* cmd = (CControldMsg::commandMute*) data;