diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/.settings/org.eclipse.pde.prefs b/codan/org.eclipse.cdt.codan.ui.cxx/.settings/org.eclipse.pde.prefs
index ffaa8e3f1a7..b38988ebc19 100644
--- a/codan/org.eclipse.cdt.codan.ui.cxx/.settings/org.eclipse.pde.prefs
+++ b/codan/org.eclipse.cdt.codan.ui.cxx/.settings/org.eclipse.pde.prefs
@@ -27,7 +27,7 @@ compilers.p.unknown-class=0
 compilers.p.unknown-element=1
 compilers.p.unknown-identifier=0
 compilers.p.unknown-resource=0
-compilers.p.unresolved-ex-points=0
+compilers.p.unresolved-ex-points=1
 compilers.p.unresolved-import=0
 compilers.s.create-docs=false
 compilers.s.doc-folder=doc
diff --git a/codan/org.eclipse.cdt.codan.ui.cxx/plugin.xml b/codan/org.eclipse.cdt.codan.ui.cxx/plugin.xml
index 0c49b543a37..e238ff799f7 100644
--- a/codan/org.eclipse.cdt.codan.ui.cxx/plugin.xml
+++ b/codan/org.eclipse.cdt.codan.ui.cxx/plugin.xml
@@ -8,6 +8,15 @@
             class="org.eclipse.cdt.codan.internal.ui.cxx.Startup"></startup>
    </extension>
 
+   <!-- Suppress startup in org.eclipse.ease.runScript application (bug 580960) -->
+   <!-- Expect an 'Unknown extension point' warning when using the standard CDT target platform -->
+   <extension
+         point="org.eclipse.ease.headless">
+      <startupBlacklist
+            className="org.eclipse.cdt.codan.internal.ui.cxx.Startup">
+      </startupBlacklist>
+   </extension>
+
    <extension
          point="org.eclipse.ui.menus">
       <menuContribution
diff --git a/releng/scripts/do_project_settings.sh b/releng/scripts/do_project_settings.sh
index f20c16e0c8d..8107be39139 100755
--- a/releng/scripts/do_project_settings.sh
+++ b/releng/scripts/do_project_settings.sh
@@ -103,6 +103,12 @@ git ls-files  -- \*\*/.project ":!$COREPROJECT/.project" | while read i ; do
                 '-es@compilers.p.unknown-identifier=0@compilers.p.unknown-identifier=1@' \
                 $d/.settings/org.eclipse.pde.prefs
         fi
+        if echo $i | grep 'org.eclipse.cdt.codan.ui.cxx' > /dev/null; then
+            # Special case, see comment in org.eclipse.cdt.codan.ui.cxx/plugin.xml
+            sed -i \
+                '-es@compilers.p.unresolved-ex-points=0@compilers.p.unresolved-ex-points=1@' \
+                $d/.settings/org.eclipse.pde.prefs
+        fi
     else
         rm -f $d/.settings/org.eclipse.pde*.prefs
     fi