diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index fe464831a05..d838cade11b 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,9 @@
+2004-10-18 Alain Magloire
+	Make ICDIRuntimeOptions be part of ICDITarget
+	* cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
+	* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
+	* cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRuntimeOptions.java
+
 2004-10-18 David Inglis
 	Update to new ICDIDebugger interface deprecating old
 	
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
index 2b00ceaa6ab..18da7f9f604 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDISession.java
@@ -109,13 +109,6 @@ public interface ICDISession {
 	 */
 	ICDIConfiguration getConfiguration();
 
-	/**
-	 * Returns the Runtime options for this debug session.
-	 * 
-	 * @return the configuration description
-	 */
-	ICDIRuntimeOptions getRuntimeOptions();
-
 	/**
 	 * Causes this element to terminate, generating a <code>KIND_TERMINATE</code> event.  
 	 *
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRuntimeOptions.java
similarity index 88%
rename from debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java
rename to debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRuntimeOptions.java
index fea5e07a43c..a5b289dfce5 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/ICDIRuntimeOptions.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDIRuntimeOptions.java
@@ -9,16 +9,18 @@
  *     QNX Software Systems - Initial API and implementation
  *******************************************************************************/
 
-package org.eclipse.cdt.debug.core.cdi;
+package org.eclipse.cdt.debug.core.cdi.model;
 
 import java.util.Properties;
 
+import org.eclipse.cdt.debug.core.cdi.CDIException;
+
 /**
  * Describes the configuration of debug session.
  * 
  * @since Aug 6, 2002
  */
-public interface ICDIRuntimeOptions {
+public interface ICDIRuntimeOptions extends ICDIObject {
 
 	/**
 	 * Program/Inferior arguments.
diff --git a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
index 601fce27bc9..bdde53bdaa3 100644
--- a/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
+++ b/debug/org.eclipse.cdt.debug.core/cdi/org/eclipse/cdt/debug/core/cdi/model/ICDITarget.java
@@ -163,6 +163,13 @@ public interface ICDITarget extends ICDIThreadGroup, ICDISessionObject {
 	 */
 	void signal(ICDISignal signal) throws CDIException;
 
+	/**
+	 * Returns the Runtime options for this target debug session.
+	 * 
+	 * @return the configuration description
+	 */
+	ICDIRuntimeOptions getRuntimeOptions();
+
 	/**
 	 * Return a ICDICondition
 	 */