diff --git a/ChangeLog b/ChangeLog
index 9ec1a348a..092040c35 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-04-19  Richard Frith-Macdonald <rfm@gnu.org>
+
+	* Source/NSThread.m: rewrite
+	* Source/NSCountedSet.m: minor fix in new unique method
+	* Source/NSGCountedSet.m: ditto
+
 2000-04-18  Adam Fedor  <fedor@gnu.org>
 
 	* base/configure.in: add a test to see whether a symlink
diff --git a/Headers/gnustep/base/NSThread.h b/Headers/gnustep/base/NSThread.h
index 975788711..4e849ad71 100644
--- a/Headers/gnustep/base/NSThread.h
+++ b/Headers/gnustep/base/NSThread.h
@@ -41,12 +41,15 @@ typedef enum
 
 @interface NSThread : NSObject
 {
+  id			_target;
+  id			_arg;
+  SEL			_selector;
+  BOOL			_active;
 @public
-   objc_thread_t	_thread_id;
-   NSHandler		*_exception_handler;
-   NSMutableDictionary	*_thread_dictionary;
-   struct autorelease_thread_vars _autorelease_vars;
-   id			_gcontext;
+  NSHandler		*_exception_handler;
+  NSMutableDictionary	*_thread_dictionary;
+  struct autorelease_thread_vars _autorelease_vars;
+  id			_gcontext;
 }
 
 + (NSThread*) currentThread;