diff --git a/src/ebusd/Makefile.am b/src/ebusd/Makefile.am
index 592eb51f..0fdeedfa 100644
--- a/src/ebusd/Makefile.am
+++ b/src/ebusd/Makefile.am
@@ -3,6 +3,7 @@ AM_CXXFLAGS = -fpic \
 	      -Wextra \
 	      -isystem$(top_srcdir)/src/lib/utils \
 	      -isystem$(top_srcdir)/src/lib/ebus \
+	      -DSYSCONFDIR=\"$(sysconfdir)\" \
 	      -DLOCALSTATEDIR=\"$(localstatedir)\"
 
 bin_PROGRAMS = ebusd
@@ -13,10 +14,11 @@ ebusd_SOURCES = bushandler.cpp \
 		network.h \
 		mainloop.cpp \
 		mainloop.h \
+		main.h \
 		main.cpp
 
-ebusd_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \
-              $(top_srcdir)/src/lib/ebus/libebus.a \
+ebusd_LDADD = ../lib/utils/libutils.a \
+              ../lib/ebus/libebus.a \
 	      -lpthread \
 	      -lrt
 
diff --git a/src/lib/ebus/Makefile.am b/src/lib/ebus/Makefile.am
index ca9257ac..fc66a0dc 100644
--- a/src/lib/ebus/Makefile.am
+++ b/src/lib/ebus/Makefile.am
@@ -9,6 +9,7 @@ libebus_a_SOURCES = result.cpp \
 		    result.h \
 		    symbol.cpp \
 		    symbol.h \
+		    filereader.h \
 		    data.cpp \
 		    data.h \
 		    device.cpp \
diff --git a/src/lib/ebus/test/Makefile.am b/src/lib/ebus/test/Makefile.am
index 63103e50..85e0ad87 100644
--- a/src/lib/ebus/test/Makefile.am
+++ b/src/lib/ebus/test/Makefile.am
@@ -9,16 +9,16 @@ noinst_PROGRAMS = test_device \
 		  test_message
 
 test_device_SOURCES = test_device.cpp
-test_device_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
+test_device_LDADD = ../libebus.a
 
 test_symbol_SOURCES = test_symbol.cpp
-test_symbol_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
+test_symbol_LDADD = ../libebus.a
 
 test_data_SOURCES = test_data.cpp
-test_data_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
+test_data_LDADD = ../libebus.a
 
 test_message_SOURCES = test_message.cpp
-test_message_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
+test_message_LDADD = ../libebus.a
 
 distclean-local:
 	-rm -f Makefile.in
diff --git a/src/tools/Makefile.am b/src/tools/Makefile.am
index d68683ef..47c48ab1 100644
--- a/src/tools/Makefile.am
+++ b/src/tools/Makefile.am
@@ -8,13 +8,11 @@ bin_PROGRAMS = ebusctl \
 	       ebusfeed
 
 ebusctl_SOURCES = ebusctl.cpp
-
-ebusctl_LDADD = $(top_srcdir)/src/lib/utils/libutils.a
+ebusctl_LDADD = ../lib/utils/libutils.a
 
 ebusfeed_SOURCES = ebusfeed.cpp
-
-ebusfeed_LDADD = $(top_srcdir)/src/lib/utils/libutils.a \
-	         $(top_srcdir)/src/lib/ebus/libebus.a
+ebusfeed_LDADD = ../lib/utils/libutils.a \
+	         ../lib/ebus/libebus.a
 
 distclean-local:
 	-rm -f Makefile.in