diff --git a/releng/org.eclipse.rse.build/maps/rse.map b/releng/org.eclipse.rse.build/maps/rse.map
index dc156b1d44e..2d45db07ba8 100644
--- a/releng/org.eclipse.rse.build/maps/rse.map
+++ b/releng/org.eclipse.rse.build/maps/rse.map
@@ -1,12 +1,5 @@
!*************** PROJECT CONTRIBUTION ********************************************************
-
-!*** Special entries from eclipse
-
-plugin@org.eclipse.test=v20070226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-fragment@org.eclipse.ant.optional.junit=v20050226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-
!*** Project's plugins, features and fragments
-
feature@org.eclipse.rse=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
feature@org.eclipse.rse.core=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
feature@org.eclipse.rse.dstore=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
diff --git a/releng/org.eclipse.rse.build/maps/testdrivers.map b/releng/org.eclipse.rse.build/maps/testdrivers.map
new file mode 100644
index 00000000000..26f44fde6f0
--- /dev/null
+++ b/releng/org.eclipse.rse.build/maps/testdrivers.map
@@ -0,0 +1,6 @@
+!*************** PROJECT CONTRIBUTION ********************************************************
+
+!*** Special entries from eclipse
+
+plugin@org.eclipse.test=v20070226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
+fragment@org.eclipse.ant.optional.junit=v20050226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
diff --git a/releng/org.eclipse.rse.build/template/buildNotes.php b/releng/org.eclipse.rse.build/template/buildNotes.php
index 497016e9793..4b655aca9b5 100755
--- a/releng/org.eclipse.rse.build/template/buildNotes.php
+++ b/releng/org.eclipse.rse.build/template/buildNotes.php
@@ -59,7 +59,7 @@
Several smaller bug fixes have been made for search results, archive
handling, and thread-safety.
-At least 46 bugs were fixed: Use
+At least 49 bugs were fixed: Use
diff --git a/releng/org.eclipse.tm.releng/maps/rse.map b/releng/org.eclipse.tm.releng/maps/rse.map
index ce495febde1..2d45db07ba8 100644
--- a/releng/org.eclipse.tm.releng/maps/rse.map
+++ b/releng/org.eclipse.tm.releng/maps/rse.map
@@ -1,12 +1,5 @@
!*************** PROJECT CONTRIBUTION ********************************************************
-
-!*** Special entries from eclipse
-
-plugin@org.eclipse.test=v20070226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-fragment@org.eclipse.ant.optional.junit=v20050226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
-
!*** Project's plugins, features and fragments
-
feature@org.eclipse.rse=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse-feature
feature@org.eclipse.rse.core=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.core-feature
feature@org.eclipse.rse.dstore=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/features/org.eclipse.rse.dstore-feature
@@ -44,9 +37,9 @@ plugin@org.eclipse.rse.services.files.ftp=v20080212,:pserver:anonymous:none@dev.
plugin@org.eclipse.rse.services.local=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.local
plugin@org.eclipse.rse.services.ssh=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.ssh
plugin@org.eclipse.rse.services.telnet=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services.telnet
-plugin@org.eclipse.rse.services=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
+plugin@org.eclipse.rse.services=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.services
plugin@org.eclipse.rse.shells.ui=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.shells.ui
-plugin@org.eclipse.rse.subsystems.files.core=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
+plugin@org.eclipse.rse.subsystems.files.core=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.core
plugin@org.eclipse.rse.subsystems.files.dstore=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.dstore
plugin@org.eclipse.rse.subsystems.files.ftp=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.ftp
plugin@org.eclipse.rse.subsystems.files.local=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.files.local
@@ -60,7 +53,7 @@ plugin@org.eclipse.rse.subsystems.shells.dstore=v20080212,:pserver:anonymous:non
plugin@org.eclipse.rse.subsystems.shells.local=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.local
plugin@org.eclipse.rse.subsystems.shells.ssh=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.ssh
plugin@org.eclipse.rse.subsystems.shells.telnet=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.subsystems.shells.telnet
-plugin@org.eclipse.rse.tests=v20080213a,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
+plugin@org.eclipse.rse.tests=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests
plugin@org.eclipse.rse.tests.framework=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/tests/org.eclipse.rse.tests.framework
-plugin@org.eclipse.rse.ui=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
+plugin@org.eclipse.rse.ui=v20080214,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.ui
plugin@org.eclipse.rse.useractions=v20080212,:pserver:anonymous:none@dev.eclipse.org:/cvsroot/dsdp,,org.eclipse.tm.rse/plugins/org.eclipse.rse.useractions
\ No newline at end of file
diff --git a/releng/org.eclipse.tm.releng/maps/testdrivers.map b/releng/org.eclipse.tm.releng/maps/testdrivers.map
new file mode 100644
index 00000000000..26f44fde6f0
--- /dev/null
+++ b/releng/org.eclipse.tm.releng/maps/testdrivers.map
@@ -0,0 +1,6 @@
+!*************** PROJECT CONTRIBUTION ********************************************************
+
+!*** Special entries from eclipse
+
+plugin@org.eclipse.test=v20070226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,
+fragment@org.eclipse.ant.optional.junit=v20050226,:pserver:anonymous@dev.eclipse.org:/cvsroot/eclipse,