diff --git a/ChangeLog b/ChangeLog
index 78450025e..7808547f2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,11 +2,12 @@
 
 	* Source/NSBundle.m: Strip path extension from main bundle name on
 	cygwin.
+	* Headers/Foundation/NSPortNameServer.h: Improve documentation
 
 2006-10-18  Richard Frith-Macdonald <rfm@gnu.org>
 
 	* Source/Makefile.postamble:
-	Rewmove use of UNICODE_HEADERS which appears to beave been breaking
+	Remove use of UNICODE_HEADERS which appears to beave been breaking
 	solaris build.
 
 2006-10-18  Richard Frith-Macdonald <rfm@gnu.org>
diff --git a/Headers/Foundation/NSPortNameServer.h b/Headers/Foundation/NSPortNameServer.h
index 2417a346a..572c5cb60 100644
--- a/Headers/Foundation/NSPortNameServer.h
+++ b/Headers/Foundation/NSPortNameServer.h
@@ -35,6 +35,8 @@
 #include <Foundation/NSObject.h>
 #include <Foundation/NSMapTable.h>
 
+#if	OS_API_VERSION(GS_API_MACOSX,HS_API_LATEST)
+
 #if	defined(__cplusplus)
 extern "C" {
 #endif
@@ -69,6 +71,18 @@ extern "C" {
 
 @interface NSMessagePortNameServer : NSPortNameServer
 + (id) sharedInstance;
+
+/** Returns the [NSMessagePort] instance registered for the specified name
+ * if it exists on the local host.
+ */
+- (NSPort*) portForName: (NSString*)name;
+
+/** Returns the port registered for the specified name (if it exists).<br />
+ * The host must be an empty string or nil, since [NSMessagePort] instances
+ * on other hosts are inaccessible from the current host.
+ */
+- (NSPort*) portForName: (NSString*)name
+		 onHost: (NSString*)host;
 @end
 
 #if	defined(__cplusplus)
@@ -77,3 +91,5 @@ extern "C" {
 
 #endif
 
+#endif
+