diff --git a/releng/org.eclipse.tm.releng.master-feature/feature.xml b/releng/org.eclipse.tm.releng.master-feature/feature.xml
index 39e5a6d87f8..b4b3cb82d43 100644
--- a/releng/org.eclipse.tm.releng.master-feature/feature.xml
+++ b/releng/org.eclipse.tm.releng.master-feature/feature.xml
@@ -71,6 +71,10 @@
          id="org.eclipse.rse.wince"
          version="0.0.0"/>
 -->
+   <includes
+         id="org.eclipse.rse.scp"
+         version="0.0.0"/>
+
    <includes
          id="org.eclipse.tm.tcf.feature"
          version="0.0.0"/>
diff --git a/releng/org.eclipse.tm.releng/buildExtra.xml b/releng/org.eclipse.tm.releng/buildExtra.xml
index 2bb06cc165f..d535cefba23 100644
--- a/releng/org.eclipse.tm.releng/buildExtra.xml
+++ b/releng/org.eclipse.tm.releng/buildExtra.xml
@@ -46,7 +46,7 @@
 			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}"
 			            dirmode="775"
 			            filemode="664"
-			            excludes="**/org.eclipse.*.all*, **/org.eclipse.*.all*/**, **/org.eclipse.*.examples*, **/org.eclipse.*.examples*/**, **/org.eclipse.tm*, **/org.eclipse.tm*/**, **/org.eclipse.rse.wince*, **/org.eclipse.rse.wince*/**, **/org.eclipse.rse.useractions*, **/org.eclipse.rse.useractions*/**, **/org.eclipse.rse.tests*, **/org.eclipse.rse.tests*/**, **/org.eclipse.rse.discovery*, **/org.eclipse.rse.discovery*/** "
+			            excludes="**/org.eclipse.*.all*, **/org.eclipse.*.all*/**, **/org.eclipse.*.examples*, **/org.eclipse.*.examples*/**, **/org.eclipse.tm*, **/org.eclipse.tm*/**, **/org.eclipse.rse.wince*, **/org.eclipse.rse.wince*/**, **/org.eclipse.rse.scp*, **/org.eclipse.rse.scp*/**, **/org.eclipse.rse.subsystems.files.scp*, **/org.eclipse.rse.subsystems.files.scp*/**, **/org.eclipse.rse.useractions*, **/org.eclipse.rse.useractions*/**, **/org.eclipse.rse.tests*, **/org.eclipse.rse.tests*/**, **/org.eclipse.rse.discovery*, **/org.eclipse.rse.discovery*/** "
 			>
 				<include name="**/org.eclipse.rse*" />
 				<include name="**/org.eclipse.rse*/**" />
@@ -79,7 +79,7 @@
 			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}"
 			            dirmode="775"
 			            filemode="664"
-			            excludes="**/org.eclipse.*.all*, **/org.eclipse.*.all*/**, **/org.eclipse.*.examples*, **/org.eclipse.*.examples*/**, **/org.eclipse.*.sdk*, **/org.eclipse.*.sdk*/**,**/org.eclipse.*.doc*, **/org.eclipse.*.doc*/*, **/org.eclipse.*.source*, **/org.eclipse.*.source*/**, **/org.apache.*.source*, **/org.apache.*.source*/**, **/*src.zip, **/org.eclipse.tm*, **/org.eclipse.tm*/**, **/org.eclipse.rse.wince*, **/org.eclipse.rse.wince*/**, **/org.eclipse.rse.useractions*, **/org.eclipse.rse.useractions*/**, **/org.eclipse.rse.tests*, **/org.eclipse.rse.tests*/**, **/org.eclipse.rse.discovery*, **/org.eclipse.rse.discovery*/** "
+			            excludes="**/org.eclipse.*.all*, **/org.eclipse.*.all*/**, **/org.eclipse.*.examples*, **/org.eclipse.*.examples*/**, **/org.eclipse.*.sdk*, **/org.eclipse.*.sdk*/**,**/org.eclipse.*.doc*, **/org.eclipse.*.doc*/*, **/org.eclipse.*.source*, **/org.eclipse.*.source*/**, **/org.apache.*.source*, **/org.apache.*.source*/**, **/*src.zip, **/org.eclipse.tm*, **/org.eclipse.tm*/**, **/org.eclipse.rse.wince*, **/org.eclipse.rse.wince*/**, **/org.eclipse.rse.scp*, **/org.eclipse.rse.scp*/**, **/org.eclipse.rse.subsystems.files.scp*, **/org.eclipse.rse.subsystems.files.scp*/** **/org.eclipse.rse.useractions*, **/org.eclipse.rse.useractions*/**, **/org.eclipse.rse.tests*, **/org.eclipse.rse.tests*/**, **/org.eclipse.rse.discovery*, **/org.eclipse.rse.discovery*/** "
 			>
 				<include name="**/org.eclipse.rse*" />
 				<include name="**/org.eclipse.rse*/**" />
@@ -176,6 +176,20 @@
 			<zipfileset refid="rootfiles" />
 		</zip>
 
+		<!-- build SCP plugins -->
+		<zip destfile="${buildDirectory}/${buildLabel}/RSE-files-scp-incubation-${buildAlias}.zip" update="true">
+			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" excludes="**/org.eclipse.*.test*, **/org.eclipse.*.test*/**">
+				<include name="**/org.eclipse.rse.scp*" />
+				<include name="**/org.eclipse.rse.scp*/**" />
+				<include name="**/org.eclipse.rse.scp*/**/**" />
+				<include name="**/org.eclipse.rse.subsystems.files.scp*" />
+				<include name="**/org.eclipse.rse.subsystems.files.scp*/**" />
+				<include name="**/org.eclipse.rse.subsystems.files.scp*/**/**" />
+			</zipfileset>
+			<zipfileset refid="rootfiles" />
+		</zip>
+
+		
 		<!-- build TCF -->
 		<zip destfile="${buildDirectory}/${buildLabel}/TCF-SDK-incubation-${buildAlias}.zip" update="true">
 			<zipfileset src="${buildDirectory}/${buildLabel}/${allZip}" dirmode="775" filemode="664" excludes="**/org.eclipse.*.test*, **/org.eclipse.*.test*/**">
diff --git a/releng/org.eclipse.tm.releng/maps/scp.map b/releng/org.eclipse.tm.releng/maps/scp.map
new file mode 100644
index 00000000000..4f5c440da91
--- /dev/null
+++ b/releng/org.eclipse.tm.releng/maps/scp.map
@@ -0,0 +1,2 @@
+feature@org.eclipse.rse.scp=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.scp-feature
+plugin@org.eclipse.rse.subsystems.files.scp=HEAD,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.scp