diff --git a/build/org.eclipse.cdt.autotools-feature/feature.xml b/build/org.eclipse.cdt.autotools-feature/feature.xml
index 142c15f11cf..017514b9975 100644
--- a/build/org.eclipse.cdt.autotools-feature/feature.xml
+++ b/build/org.eclipse.cdt.autotools-feature/feature.xml
@@ -17,10 +17,6 @@
%license
-
-
-
-
diff --git a/build/org.eclipse.cdt.autotools-feature/p2.inf b/build/org.eclipse.cdt.autotools-feature/p2.inf
index 73fc9f2d12e..720696ace2a 100644
--- a/build/org.eclipse.cdt.autotools-feature/p2.inf
+++ b/build/org.eclipse.cdt.autotools-feature/p2.inf
@@ -4,5 +4,5 @@ provides.99.namespace=org.eclipse.equinox.p2.iu
provides.99.name=org.eclipse.linuxtools.cdt.autotools.feature.group
provides.99.version=$version$
instructions.configure=\
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/indigo,type:0,name:CDT,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/indigo,type:1,name:CDT,enabled:false);
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/juno,type:0,name:CDT,enabled:false); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/juno,type:1,name:CDT,enabled:false);
diff --git a/build/org.eclipse.cdt.autotools.source-feature/feature.xml b/build/org.eclipse.cdt.autotools.source-feature/feature.xml
index 62f5daa388f..eb233097564 100644
--- a/build/org.eclipse.cdt.autotools.source-feature/feature.xml
+++ b/build/org.eclipse.cdt.autotools.source-feature/feature.xml
@@ -17,10 +17,6 @@
%license
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
index 293f57fb6f2..27981f690e9 100644
--- a/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
+++ b/cross/org.eclipse.cdt.launch.remote-feature/feature.xml
@@ -17,10 +17,6 @@
%license
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
index 80882f96907..c49965e1796 100644
--- a/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
+++ b/jtag/org.eclipse.cdt.debug.gdbjtag-feature/feature.xml
@@ -18,10 +18,6 @@
%license
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/lrparser/org.eclipse.cdt.core.lrparser.source.feature/feature.xml b/lrparser/org.eclipse.cdt.core.lrparser.source.feature/feature.xml
index 57aacf5d9b4..07dd84a538e 100644
--- a/lrparser/org.eclipse.cdt.core.lrparser.source.feature/feature.xml
+++ b/lrparser/org.eclipse.cdt.core.lrparser.source.feature/feature.xml
@@ -17,10 +17,6 @@
%license
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/releng/org.eclipse.cdt.platform-feature/feature.xml b/releng/org.eclipse.cdt.platform-feature/feature.xml
index 91b29d8fc44..06695f7fa0c 100644
--- a/releng/org.eclipse.cdt.platform-feature/feature.xml
+++ b/releng/org.eclipse.cdt.platform-feature/feature.xml
@@ -17,10 +17,6 @@
%license
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/releng/org.eclipse.cdt.testing-feature/feature.xml b/releng/org.eclipse.cdt.testing-feature/feature.xml
index 881d23cc758..7d2161d47c3 100644
--- a/releng/org.eclipse.cdt.testing-feature/feature.xml
+++ b/releng/org.eclipse.cdt.testing-feature/feature.xml
@@ -18,10 +18,6 @@
%license
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
index e43e6bf853c..cb845641752 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.sdk.feature/feature.xml
@@ -18,10 +18,6 @@
%license
-
-
-
-
diff --git a/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml b/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml
index 1d31c82d452..98133b6c17a 100644
--- a/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml
+++ b/upc/org.eclipse.cdt.core.parser.upc.source.feature/feature.xml
@@ -17,10 +17,6 @@
%license
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/xlc/org.eclipse.cdt.xlc.source.feature/feature.xml b/xlc/org.eclipse.cdt.xlc.source.feature/feature.xml
index 59758a0c4e1..1e4100d3711 100644
--- a/xlc/org.eclipse.cdt.xlc.source.feature/feature.xml
+++ b/xlc/org.eclipse.cdt.xlc.source.feature/feature.xml
@@ -17,10 +17,6 @@
%license
-
-
-
-