diff --git a/.gitignore b/.gitignore
index 502d4ff3..c819aec0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,4 +12,4 @@
 .deps/
 *.o
 *.dirstamp
-/feed
+/ebusd_feed
diff --git a/Makefile.am b/Makefile.am
index ee525caa..079eda9f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 AM_CXXFLAGS = $(LIBEBUS_CFLAGS) -I$(top_srcdir)/utils -fpic -Wall -Wextra
 
-bin_PROGRAMS = ebusd
+bin_PROGRAMS = ebusd ebusd_feed
 
 ebusd_SOURCES = src/main.cpp \
 	        src/baseloop.cpp \
@@ -22,9 +22,7 @@ ebusd_LDADD = $(LIBEBUS_LIBS) \
 
 dist_noinst_SCRIPTS = autogen.sh
 
-noinst_PROGRAMS = feed
+ebusd_feed_SOURCES = tools/ebusd_feed.cpp \
+		     utils/appl.cpp
 
-feed_SOURCES = tools/feed.cpp \
-	       utils/appl.cpp
-
-feed_LDADD = $(LIBEBUS_LIBS)
+ebusd_feed_LDADD = $(LIBEBUS_LIBS)
diff --git a/tools/ebus_dump.bin b/tools/ebus_dump.bin
deleted file mode 100644
index 64299892..00000000
Binary files a/tools/ebus_dump.bin and /dev/null differ
diff --git a/tools/feed.cpp b/tools/ebusd_feed.cpp
similarity index 91%
rename from tools/feed.cpp
rename to tools/ebusd_feed.cpp
index 759a6678..07c76da0 100644
--- a/tools/feed.cpp
+++ b/tools/ebusd_feed.cpp
@@ -33,11 +33,11 @@ Appl& A = Appl::Instance();
 void define_args()
 {
 	A.addItem("p_device", Appl::Param("/dev/ttyUSB60"), "d", "device",
-		  "dummy serial device (default: /dev/ttyUSB60)\n\t\t(socat -d -d pty,raw,echo=0 pty,raw,echo=0)",
+		  "dummy serial device (default: /dev/ttyUSB60)\n\t\t(hint: socat -d -d pty,raw,echo=0 pty,raw,echo=0)",
 		  Appl::type_string, Appl::opt_mandatory);
 
-	A.addItem("p_file", Appl::Param("test/ebus_dump.bin"), "f", "file",
-		  "dump file with raw data (default: test/ebus_dump.bin)",
+	A.addItem("p_file", Appl::Param(""), "f", "file",
+		  "dump file with raw data",
 		  Appl::type_string, Appl::opt_mandatory);
 
 	A.addItem("p_time", Appl::Param(10000), "t", "time",