diff --git a/debug/org.eclipse.cdt.debug.core/ChangeLog b/debug/org.eclipse.cdt.debug.core/ChangeLog
index 057cd99614f..5b98ecf3d67 100644
--- a/debug/org.eclipse.cdt.debug.core/ChangeLog
+++ b/debug/org.eclipse.cdt.debug.core/ChangeLog
@@ -1,3 +1,7 @@
+2003-04-22 Mikhail Khodjaiants
+	Disconnect: terminate should be called from the disconnect event handler.
+	* CDebugTarget.java
+
 2003-04-21 Mikhail Khodjaiants
 	Disconnnect: target should be disconnected before terminate the session 
 	because of race condition.
diff --git a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
index a24899eccc6..8fb06161182 100644
--- a/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
+++ b/debug/org.eclipse.cdt.debug.core/src/org/eclipse/cdt/debug/internal/core/model/CDebugTarget.java
@@ -802,16 +802,6 @@ public class CDebugTarget extends CDebugElement
 		try
 		{
 			getCDITarget().disconnect();
-			try
-			{
-				// wait until the target is disconnected ????
-				for( int i = 0; !isDisconnected() && i < 5; ++i )
-					Thread.sleep( 1000 );
-			}
-			catch( InterruptedException ie )
-			{
-			}
-			getCDISession().terminate();
 		}
 		catch( CDIException e )
 		{
@@ -1179,8 +1169,11 @@ public class CDebugTarget extends CDebugElement
 			{
 				logError( e );
 			}
+			fireChangeEvent( DebugEvent.STATE );
+/*
 			cleanup();
 			fireTerminateEvent();
+*/
 		}
 	}