diff --git a/MAC/APL/RTCCommon/configure.in b/MAC/APL/RTCCommon/configure.in
index cacd398497ef4c0d5ff29fa974a67f6c5db10d11..3970f415028297475b293fef424428a1b5ab2220 100644
--- a/MAC/APL/RTCCommon/configure.in
+++ b/MAC/APL/RTCCommon/configure.in
@@ -63,6 +63,5 @@ AC_OUTPUT(
 	src/Makefile
 	test/Makefile
 	include/Makefile
-	include/APL/Makefile
 	include/APL/RTCCommon/Makefile
 )
diff --git a/MAC/APL/RTCCommon/include/APL/Makefile.am b/MAC/APL/RTCCommon/include/APL/Makefile.am
deleted file mode 100644
index 1e9f93c00f2a7bd0de225bc0c74b939a16000b84..0000000000000000000000000000000000000000
--- a/MAC/APL/RTCCommon/include/APL/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= RTCCommon
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/RTCCommon/include/APL/RTCCommon/Makefile.am b/MAC/APL/RTCCommon/include/APL/RTCCommon/Makefile.am
index e376e493bcce7d814b221401827f4893c8849eb4..5e1493ef8cd94b666a25383a2e381f22786af850 100644
--- a/MAC/APL/RTCCommon/include/APL/RTCCommon/Makefile.am
+++ b/MAC/APL/RTCCommon/include/APL/RTCCommon/Makefile.am
@@ -1,3 +1,5 @@
+pkginclude_HEADERS = Package__Version.h
+
 # if HAVE_SHMEM
 # SUBDIRS = shmem .
 # endif
diff --git a/MAC/APL/RTCCommon/include/Makefile.am b/MAC/APL/RTCCommon/include/Makefile.am
index 803db7814f3a21ef886065f90b42a16c729d4e26..6a3689028b333722748e29f82db2214eba98dd91 100644
--- a/MAC/APL/RTCCommon/include/Makefile.am
+++ b/MAC/APL/RTCCommon/include/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS	= APL
+SUBDIRS	= APL/RTCCommon
 
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/RTCCommon/src/Makefile.am b/MAC/APL/RTCCommon/src/Makefile.am
index 8bf4baff3fa37c1db383c5838da4e9712ae1f067..54f50517ff736eda841a0a4e8e3ea4a99cb84c0d 100644
--- a/MAC/APL/RTCCommon/src/Makefile.am
+++ b/MAC/APL/RTCCommon/src/Makefile.am
@@ -23,7 +23,7 @@ sysconf_DATA =
 
 lib_LTLIBRARIES = librtccommon.la libgnuplot_i.la
 
-librtccommon_la_SOURCES = \
+librtccommon_la_SOURCES = Package__Version.cc  \
 	Timestamp.cc \
 	Subject.cc \
 	daemonize.c \
@@ -47,4 +47,10 @@ libgnuplot_i_la_SOURCES = \
 %.top: %.top.in
 	cp $< $@
 
+bin_PROGRAMS = versionrtccommon
+
+versionrtccommon_SOURCES      = versionrtccommon.cc
+versionrtccommon_LDADD        = librtccommon.la
+versionrtccommon_DEPENDENCIES = librtccommon.la $(LOFAR_DEPEND)
+
 include $(top_srcdir)/Makefile.common