diff --git a/src/lib/ebus/Makefile.am b/src/lib/ebus/Makefile.am
index 570375bf..6f67d137 100644
--- a/src/lib/ebus/Makefile.am
+++ b/src/lib/ebus/Makefile.am
@@ -12,6 +12,8 @@ libebus_a_SOURCES = result.cpp \
 		    data.h \
 		    port.cpp \
 		    port.h \
+		    message.cpp \
+		    message.h \
 		    command.cpp \
 		    command.h \
 		    commands.cpp \
diff --git a/src/lib/ebus/test/Makefile.am b/src/lib/ebus/test/Makefile.am
index 55dff9aa..4f76723d 100644
--- a/src/lib/ebus/test/Makefile.am
+++ b/src/lib/ebus/test/Makefile.am
@@ -6,6 +6,7 @@ AM_CXXFLAGS = -fpic \
 noinst_PROGRAMS = test_port \
 		  test_symbol \
 		  test_data \
+		  test_message \
 		  test_commands \
 		  test_configfile \
 		  test_decode \
@@ -20,6 +21,9 @@ test_symbol_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
 test_data_SOURCES = test_data.cpp
 test_data_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
 
+test_message_SOURCES = test_message.cpp
+test_message_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a
+
 test_commands_SOURCES = test_commands.cpp
 test_commands_LDADD = $(top_srcdir)/src/lib/ebus/libebus.a