diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index 49bcdb9976b..a98e2897f4e 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -125,4 +125,8 @@
          id="org.eclipse.cdt.msw"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.cdt.android.feature"
+         version="0.0.0"/>
+
 </feature>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
index aa920451e8a..552e73a574b 100644
--- a/releng/org.eclipse.cdt.releng/buildsite.xml
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -72,4 +72,7 @@
 	<feature id="org.eclipse.cdt.codan.feature" url="features/org.eclipse.cdt.codan.feature_2.0.0.@timeStamp@.jar" version="2.0.0.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
+	<feature id="org.eclipse.cdt.android.feature" url="features/org.eclipse.cdt.android.feature_1.0.0.@timeStamp@.jar" version="1.0.0.@timeStamp@">
+		<category name="CDT Optional Features"/>
+	</feature>
 </site>
diff --git a/releng/org.eclipse.cdt.releng/maps/cdt.map b/releng/org.eclipse.cdt.releng/maps/cdt.map
index a4fc6a59f0e..6315ff19082 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -175,3 +175,10 @@ plugin@org.eclipse.cdt.codan.checkers=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/c
 plugin@org.eclipse.cdt.codan.checkers.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui
 plugin@org.eclipse.cdt.codan.examples=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.examples
 feature@org.eclipse.cdt.codan.feature=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan-feature
+
+! Android
+plugin@org.eclipse.cdt.android.build.core=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/android/org.eclipse.cdt.android.build.core
+plugin@org.eclipse.cdt.android.build.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/android/org.eclipse.cdt.android.build.ui
+plugin@org.eclipse.cdt.android.debug.core=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/android/org.eclipse.cdt.android.debug.core
+plugin@org.eclipse.cdt.android.debug.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/android/org.eclipse.cdt.android.debug.ui
+feature@org.eclipse.cdt.android.feature=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/android/org.eclipse.cdt.android.feature