diff --git a/CEP/CPA/AppAgent/Solver/configure.in b/CEP/CPA/AppAgent/Solver/configure.in
index 4ed61e5f2dee6d613cbbc310f28bf687cfef25a1..a24c5fc8d6c156135a431118630d8d3b7cc8d36c 100644
--- a/CEP/CPA/AppAgent/Solver/configure.in
+++ b/CEP/CPA/AppAgent/Solver/configure.in
@@ -60,7 +60,7 @@ lofar_PACKAGE(CEP/CPA/AppAgent/OctoAgent)
 lofar_PACKAGE(CEP/CPA/AppAgent/MSVisAgent)
 lofar_PACKAGE(CEP/CPA/AppAgent/AppUtils)
 lofar_PACKAGE(CEP/CPA/VisCube)
-lofar_PACKAGE(CEP/CPA/MNS)
+lofar_PACKAGE(CEP/CPA/PSS3/MNS)
 
 dnl
 dnl Output Makefiles
diff --git a/CEP/CPA/AppAgent/bootstrap b/CEP/CPA/AppAgent/bootstrap
new file mode 100755
index 0000000000000000000000000000000000000000..06f18cde1dbfd6912ef7d927c4d35d25c7137a62
--- /dev/null
+++ b/CEP/CPA/AppAgent/bootstrap
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/CEP/CPA/PSS3/CAL/bootstrap b/CEP/CPA/PSS3/CAL/bootstrap
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..7f674c416802db5e7c438f093a99e63f63c784aa 100755
--- a/CEP/CPA/PSS3/CAL/bootstrap
+++ b/CEP/CPA/PSS3/CAL/bootstrap
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-../../../autoconf_share/bootstrap ../../../autoconf_share
+../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/CEP/CPA/PSS3/CAL/configure.in b/CEP/CPA/PSS3/CAL/configure.in
index 6a34f95ca2ebdeb276b0707e91f9dd22441617c1..7a802a5eb29c420f9e79751a23fbbbc65b4dc84a 100644
--- a/CEP/CPA/PSS3/CAL/configure.in
+++ b/CEP/CPA/PSS3/CAL/configure.in
@@ -61,7 +61,7 @@ lofar_MPI(0)
 
 lofar_QATOOLS
 lofar_DOCXX
-lofar_PACKAGE(CEP/CPA/MNS)
+lofar_PACKAGE(CEP/CPA/PSS3/MNS)
 lofar_PACKAGE(LCS/Common)
 
 dnl
diff --git a/CEP/CPA/PSS3/MNS/bootstrap b/CEP/CPA/PSS3/MNS/bootstrap
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..7f674c416802db5e7c438f093a99e63f63c784aa 100755
--- a/CEP/CPA/PSS3/MNS/bootstrap
+++ b/CEP/CPA/PSS3/MNS/bootstrap
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-../../../autoconf_share/bootstrap ../../../autoconf_share
+../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/CEP/CPA/PSS3/bootstrap b/CEP/CPA/PSS3/bootstrap
new file mode 100755
index 0000000000000000000000000000000000000000..06f18cde1dbfd6912ef7d927c4d35d25c7137a62
--- /dev/null
+++ b/CEP/CPA/PSS3/bootstrap
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/CEP/CPA/PSS3/lofarconf.in b/CEP/CPA/PSS3/lofarconf.in
new file mode 100644
index 0000000000000000000000000000000000000000..704b046095bbf0c32217697e60139627c519be56
--- /dev/null
+++ b/CEP/CPA/PSS3/lofarconf.in
@@ -0,0 +1,2 @@
+MNS
+CAL
diff --git a/CEP/CPA/PSS4/MEQ/bootstrap b/CEP/CPA/PSS4/MEQ/bootstrap
index 06f18cde1dbfd6912ef7d927c4d35d25c7137a62..7f674c416802db5e7c438f093a99e63f63c784aa 100755
--- a/CEP/CPA/PSS4/MEQ/bootstrap
+++ b/CEP/CPA/PSS4/MEQ/bootstrap
@@ -1,3 +1,3 @@
 #!/bin/sh
 
-../../../autoconf_share/bootstrap ../../../autoconf_share
+../../../../autoconf_share/bootstrap ../../../../autoconf_share
diff --git a/CEP/CPA/PSS4/bootstrap b/CEP/CPA/PSS4/bootstrap
new file mode 100755
index 0000000000000000000000000000000000000000..06f18cde1dbfd6912ef7d927c4d35d25c7137a62
--- /dev/null
+++ b/CEP/CPA/PSS4/bootstrap
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+../../../autoconf_share/bootstrap ../../../autoconf_share
diff --git a/CEP/CPA/PSS4/lofarconf.in b/CEP/CPA/PSS4/lofarconf.in
new file mode 100644
index 0000000000000000000000000000000000000000..ba99ebe5042e3dd22576fe56584989aba70e262c
--- /dev/null
+++ b/CEP/CPA/PSS4/lofarconf.in
@@ -0,0 +1 @@
+MEQ
diff --git a/CEP/CPA/lofarconf.in b/CEP/CPA/lofarconf.in
index e6d1b1713efbc0d93d9c0c7256e7b58a76438fad..9beacf597c8c1ce6eeab2b7bf44ac0cb947c2a19 100644
--- a/CEP/CPA/lofarconf.in
+++ b/CEP/CPA/lofarconf.in
@@ -1,5 +1,4 @@
-MNS
-CAL
+PSS3
 uvplot
 OCTOPUSSY
 OCTOGlish