diff --git a/Documentation/Base.gsdoc b/Documentation/Base.gsdoc
index b346fb7339..b241bea3db 100644
--- a/Documentation/Base.gsdoc
+++ b/Documentation/Base.gsdoc
@@ -304,10 +304,9 @@ notice and this notice are preserved.
 		When this is set to YES, the GNUstep extension method
 		+setShouldCleanUp: is called when the NSObject class is
 		initialised, this turns on recording of some intentionally
-		leaked memory (data structures intended to persist for the
+		kept memory (data structures intended to persist for the
 		whole life of the process), and activates cleanup of that
-		memory on process exit so that external tools such as
-		valgrind will not report the memory as possibly lost. 
+		memory on process exit.
 	      </p>
 	      <p>
 		Use of this facility is a work in progress ... many classes
diff --git a/Headers/Foundation/NSDebug.h b/Headers/Foundation/NSDebug.h
index 645d34eae5..dd0ad11537 100644
--- a/Headers/Foundation/NSDebug.h
+++ b/Headers/Foundation/NSDebug.h
@@ -137,7 +137,10 @@ GS_EXPORT void		GSDebugAllocationRemove(Class c, id o);
  * Object allocation debugging
  * should not affect performance too much, and is very useful
  * as it allows you to monitor how many objects of each class
- * your application has allocated.
+ * your application has allocated.<br />
+ * NB. For much more detailed diagnosis of memory leaks, the GNUstep
+ * additional method [NSObject-trackOwnership] may be used to log
+ * the location of the memory lifcycle of a particular object.
  */
 GS_EXPORT BOOL		GSDebugAllocationActive(BOOL active);
 
diff --git a/Headers/GNUstepBase/NSObject+GNUstepBase.h b/Headers/GNUstepBase/NSObject+GNUstepBase.h
index fb88ff74e1..0b002d8b7d 100644
--- a/Headers/GNUstepBase/NSObject+GNUstepBase.h
+++ b/Headers/GNUstepBase/NSObject+GNUstepBase.h
@@ -295,11 +295,28 @@ extern "C" {
  */
 + (BOOL) shouldCleanUp;
 
-/** Turns on tracking of retain/release for instances of the receiver.
+/** Turns on tracking of the ownership for all instances of the receiver.
+ * This could have major performance impact and if possible you should not
+ * call this class method but should use the instance method instead.
  */
 + (void) trackOwnership;
 
-/** Turns on tracking of retain/release for the receiver.
+/** Turns on tracking of ownership for the receiver.<br />
+ * This works best in conjunction with leak detection (eg as provided by
+ * AddressSanitizer/LeakSanitizer) which reports leaked memory at program
+ * exit:  once you know where leaked memory was allocated, you can alter
+ * the code to call -trackOwnership on the offending object, and can then
+ * see a log of the object life cycle to work out why it is leaked.<br />
+ * This operates by altering the class of the receiver by overriding the
+ * -retain, -release, and -dealloc methods to report when they are called
+ * for the instance.  The logs include the instance address and the stack
+ * trace at which the method was called.<br />
+ * This method also turns on atexit handing to report tracked instances
+ * which have not been deallocated by the time the process exits.
+ * All instances of a tracked class (and its subclasses) incur an overhead
+ * when the overridden methods are executed, and that overhead scales with
+ * the number of tracked instances (and classes) so tracking should be
+ * used sparingly (probably never in production code).
  */
 - (void) trackOwnership;