diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index c312a36f2fc..72bd489cc7b 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,9 @@
+2006-01-23 Mikhail Khodjaiants
+	Bug 119683: long messages during launch cause gdb to timeout, launch to fail.
+	New "createSession" method accepts File instead of IBinaryObject.
+	* ICDIDebugger.java
+	+ ICDIDebugger2.java
+
 2006-01-15 Mikhail Khodjaiants
 	Bug 123745: Disassembly view can get into endless loop.
 	* DisassemblyBlock.java
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger.java
index 6aa58cfcca1..fca9220048c 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger.java
@@ -16,8 +16,14 @@ import org.eclipse.core.runtime.CoreException;
 import org.eclipse.core.runtime.IProgressMonitor;
 import org.eclipse.debug.core.ILaunch;
 
-
+/**
+ * @deprecated use <code>ICDIDebugger2</code>.
+ */
 public interface ICDIDebugger {
+
+	/**
+	 * @deprecated use <code>createSession</code> of <code>ICDIDebugger2</code>
+	 */
 	public ICDISession createDebuggerSession(ILaunch launch, IBinaryObject exe, IProgressMonitor monitor) throws CoreException;
 
 }
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger2.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger2.java
new file mode 100644
index 00000000000..25f589bf9e1
--- /dev/null
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/core/ICDIDebugger2.java
@@ -0,0 +1,31 @@
+/*******************************************************************************
+ * Copyright (c) 2004 QNX Software Systems and others.
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * which accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * Contributors:
+ * QNX Software Systems - Initial API and implementation
+ *******************************************************************************/
+package org.eclipse.cdt.debug.core; 
+
+import java.io.File;
+import org.eclipse.cdt.debug.core.cdi.ICDISession;
+import org.eclipse.core.runtime.CoreException;
+import org.eclipse.core.runtime.IProgressMonitor;
+import org.eclipse.debug.core.ILaunch;
+ 
+/**
+ * Replacement for deprecated <code>ICDIDebugger</code>.
+ * 
+ * @since 3.1 experimental
+ */
+public interface ICDIDebugger2 extends ICDIDebugger {
+	
+	/**
+	 * <code>null</code> can be passed as <code>executable</code> allowing debuggers to create session without executables, 
+	 * or load executables later during the session.
+	 */
+	public ICDISession createSession(ILaunch launch, File executable, IProgressMonitor monitor) throws CoreException;
+}