diff --git a/MAC/APL/APLCommon/configure.in b/MAC/APL/APLCommon/configure.in
index f656400be8bd6009938bf97278c0aa7dfb1ec4eb..effeece09ebf9b7194a723c9798a15c674c63878 100644
--- a/MAC/APL/APLCommon/configure.in
+++ b/MAC/APL/APLCommon/configure.in
@@ -65,7 +65,6 @@ dnl Output Makefiles
 dnl
 AC_OUTPUT(
 include/Makefile
-include/APL/Makefile
 include/APL/APLCommon/Makefile
 src/Makefile
 test/Makefile
diff --git a/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am b/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
index ba8e9830e7ccf8ed754dcd0781da7de46a27fe85..6ca6fe6901248ae5a0b4d2aeaf1df04ec06575b1 100644
--- a/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
+++ b/MAC/APL/APLCommon/include/APL/APLCommon/Makefile.am
@@ -1,5 +1,5 @@
 pkgincludedir = $(includedir)/APL/APLCommon
-pkginclude_HEADERS = \
+pkginclude_HEADERS = Package__Version.h  \
 	APLCommonExceptions.h \
 	APL_Defines.h \
 	APLUtilities.h \
diff --git a/MAC/APL/APLCommon/include/APL/Makefile.am b/MAC/APL/APLCommon/include/APL/Makefile.am
deleted file mode 100644
index 3f54b0c18e67bdc4441bb222de5030c29c77f273..0000000000000000000000000000000000000000
--- a/MAC/APL/APLCommon/include/APL/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS	= APLCommon
-
-include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/APLCommon/include/Makefile.am b/MAC/APL/APLCommon/include/Makefile.am
index 803db7814f3a21ef886065f90b42a16c729d4e26..d992ae3446320f6d4c2ca7081f8394e0a7b992ef 100644
--- a/MAC/APL/APLCommon/include/Makefile.am
+++ b/MAC/APL/APLCommon/include/Makefile.am
@@ -1,3 +1,3 @@
-SUBDIRS	= APL
+SUBDIRS	= APL/APLCommon
 
 include $(top_srcdir)/Makefile.common
diff --git a/MAC/APL/APLCommon/src/Makefile.am b/MAC/APL/APLCommon/src/Makefile.am
index 2008d757180f382b93fe177fd7c84ce89c11b9a1..95239dfcabc110003f12ef9b86e69062bb468e58 100644
--- a/MAC/APL/APLCommon/src/Makefile.am
+++ b/MAC/APL/APLCommon/src/Makefile.am
@@ -16,7 +16,7 @@ libaplcommon_la_CPPFLAGS =  -DBOOST_DISABLE_THREADS \
 							-fmessage-length=0 \
 							-fdiagnostics-show-location=once
 
-libaplcommon_la_SOURCES  =  $(DOCHDRS) \
+libaplcommon_la_SOURCES  = Package__Version.cc   $(DOCHDRS) \
 							StartDaemon_Protocol.cc \
 							Controller_Protocol.cc \
 							APLUtilities.cc \
@@ -44,5 +44,11 @@ ph_HEADERS 				= StartDaemon_Protocol.ph \
 clean-local:
 	rm -f *.ph
 
+bin_PROGRAMS = versionaplcommon
+
+versionaplcommon_SOURCES      = versionaplcommon.cc
+versionaplcommon_LDADD        = libaplcommon.la
+versionaplcommon_DEPENDENCIES = libaplcommon.la $(LOFAR_DEPEND)
+
 include $(top_srcdir)/Makefile.common