diff --git a/build_gateway.inc b/build_gateway.inc
index d51f67af8..035cf56d8 100644
--- a/build_gateway.inc
+++ b/build_gateway.inc
@@ -65,4 +65,4 @@ GCOV := N
 # Build optional RabbitMQ filter
 # Requires librabbitmq-devel
 # 
-BUILD_RABBITMQ :=
+BUILD_RABBITMQ := N
diff --git a/server/modules/filter/Makefile b/server/modules/filter/Makefile
index f09add659..c52c8a8fa 100644
--- a/server/modules/filter/Makefile
+++ b/server/modules/filter/Makefile
@@ -51,7 +51,7 @@ LIBS=$(UTILSPATH)/skygw_utils.o -lssl -llog_manager
 MODULES= libtestfilter.so libqlafilter.so libregexfilter.so libtopfilter.so libhintfilter.so libtee.so
 
 ifndef BUILD_RABBITMQ
-BUILD_RABBITMQ=Y
+BUILD_RABBITMQ=N
 endif
 
 ifeq ($(BUILD_RABBITMQ),Y)
diff --git a/server/modules/routing/Makefile b/server/modules/routing/Makefile
index 7c903dd2d..637d5f41c 100644
--- a/server/modules/routing/Makefile
+++ b/server/modules/routing/Makefile
@@ -52,7 +52,6 @@ MODULES= libdebugcli.so libreadconnroute.so libtestroute.so libcli.so
 
 all:	$(MODULES)
 	(cd readwritesplit; make)
-	(cd binlog; make)
 
 libtestroute.so: $(TESTOBJ)
 	$(CC) $(LDFLAGS) $(TESTOBJ) $(LIBS) -o $@
@@ -75,23 +74,19 @@ libreadwritesplit.so:
 clean:
 	$(DEL) $(OBJ) $(MODULES)
 	(cd readwritesplit; touch depend.mk; make clean)
-	(cd binlog; touch depend.mk; make clean)
 
 tags:
 	ctags $(SRCS) $(HDRS)
 	(cd readwritesplit; make tags)
-	(cd binlog; make tags)
 
 depend:
 	@$(DEL) depend.mk
 	cc -M $(CFLAGS) $(SRCS) > depend.mk
 	(cd readwritesplit; touch depend.mk ; make depend)
-	(cd binlog; touch depend.mk ; make depend)
 
 install: $(MODULES)
 	install -D $(MODULES) $(DEST)/modules
 	(cd readwritesplit; make DEST=$(DEST) install)
-	(cd binlog; make DEST=$(DEST) install)
 
 cleantests:
 	$(MAKE) -C test cleantests