diff --git a/codan/org.eclipse.cdt.codan.core/plugin.xml b/codan/org.eclipse.cdt.codan.core/plugin.xml
index 7e4ad96a3c5..d37ffa3a46a 100644
--- a/codan/org.eclipse.cdt.codan.core/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.core/plugin.xml
@@ -35,9 +35,6 @@
       <super type="org.eclipse.core.resources.problemmarker"/> 
       <super type="org.eclipse.core.resources.textmarker"/> 
       
-      <super
-            type="org.eclipse.cdt.core.problem">
-      </super>
               <attribute
           name="category">
     </attribute>
diff --git a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemMarker.java b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemMarker.java
index a1e86b7d1ae..168e18d1854 100644
--- a/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemMarker.java
+++ b/codan/org.eclipse.cdt.codan.core/src/org/eclipse/cdt/codan/internal/core/model/CodanProblemMarker.java
@@ -100,7 +100,6 @@ public class CodanProblemMarker implements ICodanProblemMarker {
 		marker.setAttribute(ID, problem.getId());
 		marker.setAttribute(IMarker.CHAR_END, loc.getEndingChar());
 		marker.setAttribute(IMarker.CHAR_START, loc.getStartingChar());
-		marker.setAttribute("org.eclipse.cdt.core.problem", 42); //$NON-NLS-1$
 		String propArgs = serializeArgs(args);
 		marker.setAttribute(PROBLEM_ARGS, propArgs);
 		IProblemCategory[] cats = CodanProblemCategory.findProblemCategories(
@@ -247,7 +246,8 @@ public class CodanProblemMarker implements ICodanProblemMarker {
 			return null;
 		IResource resource = marker.getResource();
 		IProblemProfile profile = getProfile(resource);
-		CodanProblem problem = (CodanProblem) ((CodanProblem) profile.findProblem(id)).clone();
+		CodanProblem problem = (CodanProblem) ((CodanProblem) profile
+				.findProblem(id)).clone();
 		CodanSeverity sev = getSeverity(marker);
 		problem.setSeverity(sev);
 		return problem;
diff --git a/codan/org.eclipse.cdt.codan.ui/plugin.xml b/codan/org.eclipse.cdt.codan.ui/plugin.xml
index 65e508b7b57..d451d9d1ccb 100644
--- a/codan/org.eclipse.cdt.codan.ui/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.ui/plugin.xml
@@ -170,4 +170,25 @@
              priority="80">
        </markerGroupingEntry>
     </extension>
+    <extension
+          point="org.eclipse.ui.editors.annotationTypes">
+       <type
+             markerSeverity="2"
+             markerType="org.eclipse.cdt.codan.core.codanProblem"
+             name="org.eclipse.cdt.codan.ui.annotation.error"
+             super="org.eclipse.ui.workbench.texteditor.error">
+       </type>
+       <type
+             markerSeverity="1"
+             markerType="org.eclipse.cdt.codan.core.codanProblem"
+             name="org.eclipse.cdt.codan.ui.annotation.warning"
+             super="org.eclipse.ui.workbench.texteditor.warning">
+       </type>
+       <type
+             markerSeverity="0"
+             markerType="org.eclipse.cdt.codan.core.codanProblem"
+             name="org.eclipse.cdt.codan.ui.annotation.info"
+             super="org.eclipse.ui.workbench.texteditor.info">
+       </type>
+    </extension>
 </plugin>