diff --git a/discovery/org.eclipse.tm.discovery-feature/feature.xml b/discovery/org.eclipse.tm.discovery-feature/feature.xml
index 225dc31f0b2..cb6bb71ff37 100644
--- a/discovery/org.eclipse.tm.discovery-feature/feature.xml
+++ b/discovery/org.eclipse.tm.discovery-feature/feature.xml
@@ -21,6 +21,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/examples/org.eclipse.rse.examples-feature/feature.xml b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
index e98192a4823..756e05e81f2 100644
--- a/rse/examples/org.eclipse.rse.examples-feature/feature.xml
+++ b/rse/examples/org.eclipse.rse.examples-feature/feature.xml
@@ -21,6 +21,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse-feature/feature.xml b/rse/features/org.eclipse.rse-feature/feature.xml
index d7744c569ca..653a5840149 100644
--- a/rse/features/org.eclipse.rse-feature/feature.xml
+++ b/rse/features/org.eclipse.rse-feature/feature.xml
@@ -21,6 +21,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <includes
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.properties b/rse/features/org.eclipse.rse.core-feature/feature.properties
index b2d768a09df..c8275c811f8 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.properties
+++ b/rse/features/org.eclipse.rse.core-feature/feature.properties
@@ -27,8 +27,6 @@ providerName=Eclipse.org
 tmUpdateSiteName=Target Management Updates
 tmMilestoneSiteName=Target Management 2.0 Milestone Updates
 
-epMilestoneSiteName=The Eclipse Project 3.3 Milestone Updates
-
 # "copyright" property - text of the "Feature Update Copyright"
 copyright=\
 Copyright (c) 2000, 2007 IBM Corporation and others. All rights reserved.\n\
diff --git a/rse/features/org.eclipse.rse.core-feature/feature.xml b/rse/features/org.eclipse.rse.core-feature/feature.xml
index c77ae08d857..43ba8dfd3c1 100644
--- a/rse/features/org.eclipse.rse.core-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.core-feature/feature.xml
@@ -21,7 +21,6 @@
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
       <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
-      <discovery label="%epMilestoneSiteName" url="http://download.eclipse.org/eclipse/updates/3.3milestones/site.xml"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.dstore-feature/feature.xml b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
index 32774f697b0..befcd95bd6c 100644
--- a/rse/features/org.eclipse.rse.dstore-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.dstore-feature/feature.xml
@@ -20,6 +20,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.ftp-feature/feature.xml b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
index df937af7a86..0f7975cd7c9 100644
--- a/rse/features/org.eclipse.rse.ftp-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ftp-feature/feature.xml
@@ -20,6 +20,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.local-feature/feature.xml b/rse/features/org.eclipse.rse.local-feature/feature.xml
index 89182658d79..9d41f0bb4aa 100644
--- a/rse/features/org.eclipse.rse.local-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.local-feature/feature.xml
@@ -20,6 +20,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
index 881b58f35ea..0ec8db1a7a2 100644
--- a/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.remotecdt-feature/feature.xml
@@ -21,6 +21,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.sdk-feature/feature.xml b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
index c46e374b4ab..1c1050d429b 100644
--- a/rse/features/org.eclipse.rse.sdk-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.sdk-feature/feature.xml
@@ -20,6 +20,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <includes
diff --git a/rse/features/org.eclipse.rse.ssh-feature/feature.xml b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
index eef46cf4c0a..cff3be11388 100644
--- a/rse/features/org.eclipse.rse.ssh-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.ssh-feature/feature.xml
@@ -20,6 +20,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/features/org.eclipse.rse.telnet-feature/feature.xml b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
index e40df101c9e..54ed5994a20 100644
--- a/rse/features/org.eclipse.rse.telnet-feature/feature.xml
+++ b/rse/features/org.eclipse.rse.telnet-feature/feature.xml
@@ -20,6 +20,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/rse/tests/org.eclipse.rse.tests-feature/feature.xml b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
index a7f7f34f26b..5d0e1d20213 100644
--- a/rse/tests/org.eclipse.rse.tests-feature/feature.xml
+++ b/rse/tests/org.eclipse.rse.tests-feature/feature.xml
@@ -19,6 +19,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/terminal/org.eclipse.tm.terminal-feature/feature.xml b/terminal/org.eclipse.tm.terminal-feature/feature.xml
index da9a4eff14e..ecc1431033d 100644
--- a/terminal/org.eclipse.tm.terminal-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal-feature/feature.xml
@@ -19,6 +19,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
index 5731528ddf5..da8cdf8f5d7 100644
--- a/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.sdk-feature/feature.xml
@@ -20,6 +20,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <includes
diff --git a/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml b/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
index 4ff6ccbb2b7..1f813bb0721 100644
--- a/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.serial-feature/feature.xml
@@ -19,8 +19,9 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
-      <!-- TODO reference the RXTX discovery site once it exists
       <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <!-- TODO reference the RXTX discovery site once it exists
+      <discovery label="%tmRXTXSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
       -->
    </url>
 
diff --git a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml b/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
index 69a825c8458..471ca9f96e5 100644
--- a/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.ssh-feature/feature.xml
@@ -19,6 +19,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>
diff --git a/terminal/org.eclipse.tm.terminal.view-feature/feature.xml b/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
index 16726811cf2..afaeae5074d 100644
--- a/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
+++ b/terminal/org.eclipse.tm.terminal.view-feature/feature.xml
@@ -19,6 +19,7 @@
 
    <url>
       <update label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
+      <discovery label="%tmMilestoneSiteName" url="http://download.eclipse.org/dsdp/tm/updates/milestones"/>
    </url>
 
    <requires>