diff --git a/releng/EnrichPoms/CBIaggregator.sh b/releng/EnrichPoms/CBIaggregator.sh
index 7373629..ffcf653 100644
--- a/releng/EnrichPoms/CBIaggregator.sh
+++ b/releng/EnrichPoms/CBIaggregator.sh
@@ -14,27 +14,8 @@
 #   Parameters we might want to externalize into a properties file
 #================================================================================
 
-# ECLIPSE:
-DROPS4=/home/data/httpd/archive.eclipse.org/eclipse/downloads/drops4
-FILE_ECLIPSE=${DROPS4}/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz
-APP_NAME_P2DIRECTOR=org.eclipse.equinox.p2.director
+source `dirname ${0}`/properties.sh
 
-# QUESTION: set tmpdir? (-vmargs not accepted by director application?)
-
-# AGGREGATOR:
-IU_AGG_PRODUCT=org.eclipse.cbi.p2repo.cli.product
-URL_AGG_UPDATES=http://download.eclipse.org/cbi/updates/aggregator/headless/4.6/
-
-FILE_SDK_AGGR=${WORKSPACE}/SDK4Mvn.aggr
-
-# ENRICH POMS tool:
-ENRICH_POMS_JAR=${WORKSPACE}/../../pomEnricher/workspace/EnrichPoms.jar
-
-# LOCAL TOOLS:
-LOCAL_TOOLS=${WORKSPACE}/tools
-DIR_AGGREGATOR=aggregator
-AGGREGATOR=${LOCAL_TOOLS}/${DIR_AGGREGATOR}/cbiAggr
-ECLIPSE=${LOCAL_TOOLS}/eclipse/eclipse
 
 #================================================================================
 # Util functions
@@ -380,26 +361,12 @@
 	cd -
 }
 
-buildSourceJar platform/eclipse.platform.team.git \
-	bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64 \
-	I20160329-0800 \
-	org/eclipse/platform org.eclipse.core.net.win32.x86_64 1.1.0
+while read line
+do
+    buildSourceJar $line 
+done < `dirname $0`/sourceBundles.txt
 
-buildSourceJar platform/eclipse.platform.team.git \
-	bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86 \
-	I20160329-0800 \
-	org/eclipse/platform org.eclipse.core.net.win32.x86 1.1.0
-
-buildSourceJar platform/eclipse.platform.team.git \
-	bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64 \
-	I20160329-0800 \
-	org/eclipse/platform org.eclipse.core.net.linux.x86_64 1.2.0
-
-buildSourceJar platform/eclipse.platform.team.git \
-	bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86 \
-	I20160329-0800 \
-	org/eclipse/platform org.eclipse.core.net.linux.x86 1.2.0
-
+# special hack for missing source bundle with several source folders with blanks:
 buildSourceJar platform/eclipse.platform.swt.git \
 	bundles/org.eclipse.swt.tools \
 	M20161109-0400 \
@@ -411,27 +378,6 @@
 	"Mozilla Generation" \
 	"JavadocBasher"
 
-buildSourceJar platform/eclipse.platform.releng.git \
-	bundles/org.eclipse.releng.tools \
-	R4_6_2 \
-	org/eclipse/platform org.eclipse.releng.tools 3.9.0
-
-buildSourceJar platform/eclipse.platform.git \
-	update/org.eclipse.update.core \
-	R4_6_2 \
-	org/eclipse/platform org.eclipse.update.core 3.2.800 \
-	schema
-
-buildSourceJar equinox/rt.equinox.framework.git \
-	bundles/org.eclipse.osgi.compatibility.plugins \
-	I20131023-2000 \
-	org/eclipse/platform org.eclipse.osgi.compatibility.plugins 1.0.0
-
-buildSourceJar platform/eclipse.platform.releng.git \
-	bundles/org.eclipse.pde.tools.versioning \
-	I20140518-2000 \
-	org/eclipse/pde org.eclipse.pde.tools.versioning 1.0.200
-
 echo "========== Repo completed ========="
 
 cd ${WORKSPACE}
diff --git a/releng/EnrichPoms/properties.sh b/releng/EnrichPoms/properties.sh
new file mode 100644
index 0000000..7041c55
--- /dev/null
+++ b/releng/EnrichPoms/properties.sh
@@ -0,0 +1,31 @@
+#*******************************************************************************
+# Copyright (c) 2016 GK Software AG and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# which accompanies this distribution, and is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# Contributors:
+#     Stephan Herrmann - initial API and implementation
+#********************************************************************************
+
+# ECLIPSE:
+APP_NAME_P2DIRECTOR=org.eclipse.equinox.p2.director
+DROPS4=/home/data/httpd/archive.eclipse.org/eclipse/downloads/drops4
+FILE_ECLIPSE=${DROPS4}/R-4.6.1-201609071200/eclipse-SDK-4.6.1-linux-gtk-x86_64.tar.gz
+
+# AGGREGATOR:
+IU_AGG_PRODUCT=org.eclipse.cbi.p2repo.cli.product
+URL_AGG_UPDATES=http://download.eclipse.org/cbi/updates/aggregator/headless/4.6/
+
+# LOCAL TOOLS:
+LOCAL_TOOLS=${WORKSPACE}/tools
+DIR_AGGREGATOR=aggregator
+AGGREGATOR=${LOCAL_TOOLS}/${DIR_AGGREGATOR}/cbiAggr
+ECLIPSE=${LOCAL_TOOLS}/eclipse/eclipse
+
+# ENRICH POMS tool:
+ENRICH_POMS_JAR=${WORKSPACE}/../../pomEnricher/workspace/EnrichPoms.jar
+
+# AGGREGATION MODEL:
+FILE_SDK_AGGR=${WORKSPACE}/SDK4Mvn.aggr
diff --git a/releng/EnrichPoms/sourceBundles.txt b/releng/EnrichPoms/sourceBundles.txt
new file mode 100644
index 0000000..ada562d
--- /dev/null
+++ b/releng/EnrichPoms/sourceBundles.txt
@@ -0,0 +1,33 @@
+platform/eclipse.platform.team.git \
+	bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86_64 \
+	I20160329-0800 \
+	org/eclipse/platform org.eclipse.core.net.win32.x86_64 1.1.0
+platform/eclipse.platform.team.git \
+	bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.win32.x86 \
+	I20160329-0800 \
+	org/eclipse/platform org.eclipse.core.net.win32.x86 1.1.0
+platform/eclipse.platform.team.git \
+	bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86_64 \
+	I20160329-0800 \
+	org/eclipse/platform org.eclipse.core.net.linux.x86_64 1.2.0
+platform/eclipse.platform.team.git \
+	bundles/org.eclipse.core.net/fragments/org.eclipse.core.net.linux.x86 \
+	I20160329-0800 \
+	org/eclipse/platform org.eclipse.core.net.linux.x86 1.2.0
+platform/eclipse.platform.releng.git \
+	bundles/org.eclipse.releng.tools \
+	R4_6_2 \
+	org/eclipse/platform org.eclipse.releng.tools 3.9.0
+platform/eclipse.platform.git \
+	update/org.eclipse.update.core \
+	R4_6_2 \
+	org/eclipse/platform org.eclipse.update.core 3.2.800 \
+	schema
+equinox/rt.equinox.framework.git \
+	bundles/org.eclipse.osgi.compatibility.plugins \
+	I20131023-2000 \
+	org/eclipse/platform org.eclipse.osgi.compatibility.plugins 1.0.0
+platform/eclipse.platform.releng.git \
+	bundles/org.eclipse.pde.tools.versioning \
+	I20140518-2000 \
+	org/eclipse/pde org.eclipse.pde.tools.versioning 1.0.200
\ No newline at end of file