diff --git a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
index f537647aa37..97a64d64b04 100644
--- a/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
+++ b/doc/org.eclipse.cdt.doc.isv/buildDoc.xml
@@ -12,6 +12,7 @@
 		<property name="dest" value="reference/extension-points" />
 	    <record name="${basedir}/cdtconvert.txt" action="start"/>
 	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.core/plugin.xml" destination="${dest}" />
+	    <pde.convertSchemaToHTML manifest="../org.eclipse.cdt.debug.core/plugin.xml" destination="${dest}" />
 	    <record name="${basedir}/cdtconvert.txt" action="stop"/>
 	</target>
 	
diff --git a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
index d57b4882553..33ff46f16c6 100644
--- a/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
+++ b/doc/org.eclipse.cdt.doc.isv/cdtOptions.txt
@@ -1,5 +1,5 @@
 -charset "iso-8859-1"
--sourcepath "../org.eclipse.cdt.core/parser"
+-sourcepath "../org.eclipse.cdt.core/parser;../org.eclipse.cdt.debug.core/cdi"
 -d reference/api
 -classpath  ${bootclasspath};../org.apache.ant/lib/ant.jar;../org.eclipse.debug.core/dtcore.jar;../org.eclipse.compare/compare.jar;../org.eclipse.help/help.jar;../org.eclipse.help.ui/helpworkbench.jar;../org.eclipse.core.resources/resources.jar;../org.eclipse.core.runtime/runtime.jar;../org.eclipse.core.filebuffers/filebuffers.jar;../org.eclipse.core.expressions/expressions.jar;../org.eclipse.swt.win32/ws/win32/swt.jar;../org.eclipse.swt.motif/ws/motif/swt.jar;../org.eclipse.ui/ui.jar;../org.eclipse.jdt.debug/jdi.jar;../org.eclipse.debug.ui/dtui.jar;../org.eclipse.search/search.jar;../org.eclipse.jface/jface.jar;../org.eclipse.jface.text/jfacetext.jar;../org.eclipse.text/text.jar;../org.eclipse.ui.editors/editors.jar;../org.eclipse.ui.views/views.jar;../org.eclipse.ui.workbench/workbench.jar;../org.eclipse.ui.workbench.texteditor/texteditor.jar;../org.eclipse.core.variables/variables.jar;../org.eclipse.ui.ide/ide.jar;../org.eclipse.jdt.junit/junitsupport.jar;../org.eclipse.osgi/osgi.jar;../org.eclipse.osgi/core.jar;../org.eclipse.osgi/eclipseAdaptor.jar;../org.eclipse.osgi.services/services.jar;../org.eclipse.osgi.util/util.jar
 -breakiterator
@@ -10,9 +10,14 @@
 -header "<b>Eclipse CDT</b><br>Pre-release 3.0"
 -bottom "Copyright (c) IBM Corp. and others 2004.  All Rights Reserved."
 -group "C/C++ Development Tools Core Plug-in Packages" "org.eclipse.cdt.core;org.eclipse.cdt.core.*"
+-group "C/C++ Development Tools Debug Core Plug-in Packages" "org.eclipse.cdt.debug.core;org.eclipse.cdt.debug.core.*"
 -link http://java.sun.com/j2se/1.4/docs/api
 
 org.eclipse.cdt.core.dom.ast
 org.eclipse.cdt.core.dom.ast.c
 org.eclipse.cdt.core.dom.ast.c.gcc
 org.eclipse.cdt.core.dom.ast.cpp
+org.eclipse.cdt.debug.core.cdi
+org.eclipse.cdt.debug.core.cdi.event
+org.eclipse.cdt.debug.core.cdi.model
+org.eclipse.cdt.debug.core.cdi.model.type
diff --git a/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml b/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml
index 83d05d14130..d1572755dc9 100644
--- a/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml
+++ b/doc/org.eclipse.cdt.doc.isv/topics_Reference.xml
@@ -9,6 +9,10 @@
        <topic label="org.eclipse.cdt.core.dom.c" href="reference/api/org/eclipse/cdt/core/dom/ast/c/package-summary.html"/>
        <topic label="org.eclipse.cdt.core.dom.c.gcc" href="reference/api/org/eclipse/cdt/core/dom/ast/c/gcc/package-summary.html"/>
        <topic label="org.eclipse.cdt.core.dom.cpp" href="reference/api/org/eclipse/cdt/core/dom/ast/cpp/package-summary.html"/>
+       <topic label="org.eclipse.cdt.debug.core.cdi" href="reference/api/org/eclipse/cdt/debug/core/cdi/package-summary.html"/>
+       <topic label="org.eclipse.cdt.debug.core.cdi.event" href="reference/api/org/eclipse/cdt/debug/core/cdi/event/package-summary.html"/>
+       <topic label="org.eclipse.cdt.debug.core.cdi.model" href="reference/api/org/eclipse/cdt/debug/core/cdi/model/package-summary.html"/>
+       <topic label="org.eclipse.cdt.debug.core.cdi.model.type" href="reference/api/org/eclipse/cdt/debug/core/cdi/model/type/package-summary.html"/>
 	</topic>
 	<topic label="Extension Points Reference" href="reference/extension-points/index.html">
          <topic label="org.eclipse.cdt.core.CBuildConsole" href="reference/extension-points/org_eclipse_cdt_core_CBuildConsole.html"/>
@@ -18,5 +22,6 @@
          <topic label="org.eclipse.cdt.core.CProject" href="reference/extension-points/org_eclipse_cdt_core_CProject.html"/>
          <topic label="org.eclipse.cdt.core.PathEntryContainerInitializer" href="reference/extension-points/org_eclipse_cdt_core_PathEntryContainerInitializer.html"/>
          <topic label="org.eclipse.cdt.core.ProcessList" href="reference/extension-points/org_eclipse_cdt_core_ProcessList.html"/>
+         <topic label="org.eclipse.cdt.debug.core.CDebugger" href="reference/extension-points/org_eclipse_cdt_debug_core_CDebugger.html"/>
 	</topic>
 </toc>