diff --git a/Documentation/api/ClientHowto.md b/Documentation/api/ClientHowto.md
index 808bacce..c1deb2ac 100644
--- a/Documentation/api/ClientHowto.md
+++ b/Documentation/api/ClientHowto.md
@@ -257,6 +257,12 @@ the variable in question is shadowed.
 Users of your client should be able to distinguish between shadowed and
 non-shadowed variables.
 
+## Gracefully ending the debug session
+
+To ensure that delve cleans up after itself by deleting the `debug` or `debug.test` binary it creates 
+and killing any processes spawned by the program being debugged, the `Detach` command needs to be called.
+In case you are disconnecting a running program, ensure to halt the program before trying to detach.
+
 ## Testing the Client
 
 A set of [example programs is