diff --git a/Makefile.am b/Makefile.am
index 7bc49f2b..bb2867b9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,16 +25,16 @@ ebusd_LDADD = $(LIBEBUS_LIBS) \
 
 dist_noinst_SCRIPTS = autogen.sh
 
-ebusd_feed_SOURCES = tool/ebusd_feed.cpp \
+ebusd_feed_SOURCES = tools/ebusd_feed.cpp \
 		     lib/appl.cpp
 
 ebusd_feed_LDADD = $(LIBEBUS_LIBS)
 
-ebusd_send_SOURCES = tool/ebusd_send.cpp \
+ebusd_send_SOURCES = tools/ebusd_send.cpp \
 		     lib/appl.cpp \
 		     lib/tcpsocket.cpp
 
-ebusd_scan_SOURCES = tool/ebusd_scan.cpp \
+ebusd_scan_SOURCES = tools/ebusd_scan.cpp \
 		     lib/appl.cpp \
 		     lib/tcpsocket.cpp
 
diff --git a/src/ebusloop.cpp b/src/ebusloop.cpp
index aaaf0aaf..6f3babe3 100644
--- a/src/ebusloop.cpp
+++ b/src/ebusloop.cpp
@@ -31,6 +31,7 @@ EBusLoop::EBusLoop() : m_stop(false)
 
 	m_bus = new Bus(m_deviceName,
 			A.getParam<bool>("p_nodevicecheck"),
+			A.getParam<long>("p_recvtimeout"),
 			A.getParam<const char*>("p_dumpfile"),
 		        A.getParam<long>("p_dumpsize"),
 		        A.getParam<bool>("p_dump"));
diff --git a/src/main.cpp b/src/main.cpp
index 578e5e6c..5b3e4c7c 100644
--- a/src/main.cpp
+++ b/src/main.cpp
@@ -63,9 +63,13 @@ void define_args()
 		  Appl::type_bool, Appl::opt_none);
 
 	A.addItem("p_retries", Appl::Param(2), "r", "retries",
-		  "\tnumber retries send ebus command (2)\n",
+		  "\tnumber retries send ebus command (2)",
 		  Appl::type_int, Appl::opt_mandatory);
 
+	A.addItem("p_recvtimeout", Appl::Param(15000), "", "recvtimeout",
+		  "receive timeout in 'us' (15000)\n",
+		  Appl::type_long, Appl::opt_mandatory);
+
 	A.addItem("p_ebusconfdir", Appl::Param("/etc/ebusd"), "e", "ebusconfdir",
 		  "directory for ebus configuration (/etc/ebusd)\n",
 		  Appl::type_string, Appl::opt_mandatory);
@@ -103,7 +107,7 @@ void define_args()
 		  Appl::type_string, Appl::opt_mandatory);
 
 	A.addItem("p_dumpsize", Appl::Param(100), "", "dumpsize",
-		  "\tmax size for dump file in kB (100)\n",
+		  "\tmax size for dump file in 'kB' (100)\n",
 		  Appl::type_long, Appl::opt_mandatory);
 
 	A.addItem("p_settings", Appl::Param(false), "", "settings",
diff --git a/tool/ebusd_feed.cpp b/tools/ebusd_feed.cpp
similarity index 100%
rename from tool/ebusd_feed.cpp
rename to tools/ebusd_feed.cpp
diff --git a/tool/ebusd_scan.cpp b/tools/ebusd_scan.cpp
similarity index 100%
rename from tool/ebusd_scan.cpp
rename to tools/ebusd_scan.cpp
diff --git a/tool/ebusd_send.cpp b/tools/ebusd_send.cpp
similarity index 100%
rename from tool/ebusd_send.cpp
rename to tools/ebusd_send.cpp