diff --git a/releng/org.eclipse.cdt.master/feature.xml b/releng/org.eclipse.cdt.master/feature.xml
index f2086df31e5..8d015698cfa 100644
--- a/releng/org.eclipse.cdt.master/feature.xml
+++ b/releng/org.eclipse.cdt.master/feature.xml
@@ -109,4 +109,8 @@
          id="org.eclipse.cdt.bupc"
          version="0.0.0"/>
 
+   <includes
+         id="org.eclipse.cdt.codan.feature"
+         version="0.0.0"/>
+
 </feature>
diff --git a/releng/org.eclipse.cdt.releng/build.xml b/releng/org.eclipse.cdt.releng/build.xml
index c54823b38cb..7f332ea91e4 100644
--- a/releng/org.eclipse.cdt.releng/build.xml
+++ b/releng/org.eclipse.cdt.releng/build.xml
@@ -654,5 +654,23 @@
 		<antcall target="tagone">
 			<param name="tagmodule" value="org.eclipse.cdt/upc/org.eclipse.cdt.bupc-feature"/>
 		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers.ui"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/codan/org.eclipse.cdt.codan.core"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/codan/org.eclipse.cdt.codan.core.tests"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/codan/org.eclipse.cdt.codan.ui"/>
+		</antcall>
+		<antcall target="tagone">
+			<param name="tagmodule" value="org.eclipse.cdt/codan/org.eclipse.cdt.codan-feature"/>
+		</antcall>
 	</target>
 </project>
diff --git a/releng/org.eclipse.cdt.releng/buildsite.xml b/releng/org.eclipse.cdt.releng/buildsite.xml
index 5f1f314aee5..71ff1b4c520 100644
--- a/releng/org.eclipse.cdt.releng/buildsite.xml
+++ b/releng/org.eclipse.cdt.releng/buildsite.xml
@@ -69,4 +69,7 @@
 	<feature id="org.eclipse.cdt.bupc" url="features/org.eclipse.cdt.bupc_1.0.2.@timeStamp@.jar" version="1.0.2.@timeStamp@">
 		<category name="CDT Optional Features"/>
 	</feature>
+	<feature id="org.eclipse.cdt.codan.feature" url="features/org.eclipse.cdt.codan.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 44bc40d94db..9d020d53913 100644
--- a/releng/org.eclipse.cdt.releng/maps/cdt.map
+++ b/releng/org.eclipse.cdt.releng/maps/cdt.map
@@ -153,3 +153,11 @@ feature@org.eclipse.tm.tcf.feature=SVN,url=svn://dev.eclipse.org/svnroot/dsdp/or
 ! Berkeley UPC
 plugin@org.eclipse.cdt.managedbuilder.bupc.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.managedbuilder.bupc.ui
 feature@org.eclipse.cdt.bupc=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.bupc-feature
+
+! Codan
+plugin@org.eclipse.cdt.codan.checkers=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.checkers
+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.core=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.core
+plugin@org.eclipse.cdt.codan.core.test=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.core.test
+plugin@org.eclipse.cdt.codan.ui=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/codan/org.eclipse.cdt.codan.ui
+feature@org.eclipse.cdt.codan.feature=@cdtTag@,/cvsroot/tools,,org.eclipse.cdt/upc/org.eclipse.cdt.codan-feature