diff --git a/configure.ac b/configure.ac
index ecfc6b0a..90368e04 100755
--- a/configure.ac
+++ b/configure.ac
@@ -47,8 +47,6 @@ AC_ARG_WITH(contrib, AS_HELP_STRING([--without-contrib], [disable inclusion of c
 if test "x$with_contrib" != "xno"; then
 	AC_DEFINE_UNQUOTED(HAVE_CONTRIB, [1], [Defined if contributed sources are enabled.])
 fi
-AC_ARG_WITH(ebusfeed, AS_HELP_STRING([--with-ebusfeed], [enable inclusion of ebusfeed tool]), [with_ebusfeed=yes], [])
-AM_CONDITIONAL([WITH_EBUSFEED], [test "x$with_ebusfeed" == "xyes"])
 AC_ARG_WITH(mqtt, AS_HELP_STRING([--without-mqtt], [disable support for MQTT handling]), [], [with_mqtt=yes])
 if test "x$with_mqtt" != "xno"; then
 	AC_CHECK_LIB([mosquitto], [mosquitto_lib_init],
diff --git a/src/tools/CMakeLists.txt b/src/tools/CMakeLists.txt
index e35b00db..38ea734a 100644
--- a/src/tools/CMakeLists.txt
+++ b/src/tools/CMakeLists.txt
@@ -12,10 +12,4 @@ add_executable(ebuspicloader ${ebuspicloader_SOURCES})
 target_link_libraries(ebusctl utils ebus ${ebusctl_LIBS})
 target_link_libraries(ebuspicloader utils ${ebuspicloader_LIBS})
 
-if(WITH_EBUSFEED)
-  set(ebusfeed_SOURCES ebusfeed.cpp)
-  add_executable(ebusfeed ${ebusfeed_SOURCES})
-  target_link_libraries(ebusfeed utils ebus ${ebusfeed_LIBS})
-endif(WITH_EBUSFEED)
-
 install(TARGETS ebusctl ebuspicloader EXPORT ebusd DESTINATION usr/bin)
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index f9388e09..37c1058d 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -11,13 +11,6 @@ ebusctl_LDADD = ../lib/utils/libutils.a
 ebuspicloader_SOURCES = ebuspicloader.cpp intelhex/intelhexclass.cpp
 ebuspicloader_LDADD = ../lib/utils/libutils.a
 
-if WITH_EBUSFEED
-bin_PROGRAMS += ebusfeed
-ebusfeed_SOURCES = ebusfeed.cpp
-ebusfeed_LDADD = ../lib/utils/libutils.a \
-	         ../lib/ebus/libebus.a
-endif
-
 distclean-local:
 	-rm -f Makefile.in
 	-rm -rf .libs