diff --git a/build/org.eclipse.cdt.autotools-feature/p2.inf b/build/org.eclipse.cdt.autotools-feature/p2.inf
index 6839802ed07..9d3e5af7c0c 100644
--- a/build/org.eclipse.cdt.autotools-feature/p2.inf
+++ b/build/org.eclipse.cdt.autotools-feature/p2.inf
@@ -3,6 +3,4 @@ update.range=(0,$version$)
 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/kepler,type:0,name:CDT,enabled:false); \
-org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/kepler,type:1,name:CDT,enabled:false); 
+
diff --git a/releng/org.eclipse.cdt-feature/build.properties b/releng/org.eclipse.cdt-feature/build.properties
index d557457e2d3..e32f1b14346 100644
--- a/releng/org.eclipse.cdt-feature/build.properties
+++ b/releng/org.eclipse.cdt-feature/build.properties
@@ -9,5 +9,6 @@
 #     IBM Corporation - initial API and implementation
 ###############################################################################
 bin.includes = feature.xml,\
-               feature.properties
+               feature.properties,\
+               p2.inf
 root = rootfiles
diff --git a/releng/org.eclipse.cdt-feature/p2.inf b/releng/org.eclipse.cdt-feature/p2.inf
new file mode 100644
index 00000000000..c95a45b41fd
--- /dev/null
+++ b/releng/org.eclipse.cdt-feature/p2.inf
@@ -0,0 +1,3 @@
+instructions.configure=\
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/8.6,type:0,name:CDT,enabled:false); \
+org.eclipse.equinox.p2.touchpoint.eclipse.addRepository(location:http${#58}//download.eclipse.org/tools/cdt/releases/8.6,type:1,name:CDT,enabled:false);