diff --git a/ChangeLog b/ChangeLog
index b41b4ea93..4f1ff1760 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-08-26  Adam Fedor  <fedor@gnu.org>
+
+	* Source/NSMessagePort.m: For older OS comptibility, define some
+	macros if they are not already defined.
+	* Source/NSMessagePortNameServer.m: Idem.
+
 2003-08-24  David Ayers  <d.ayers@inode.at>
 
 	* Headers/Additions/GNUstepBase/GSObjCRuntime.h
diff --git a/Source/NSMessagePort.m b/Source/NSMessagePort.m
index c232f4577..c7c97bcda 100644
--- a/Source/NSMessagePort.m
+++ b/Source/NSMessagePort.m
@@ -100,6 +100,15 @@
 #define close closesocket
 #endif
 
+/* Older systems (Solaris) compatibility */
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#define PF_LOCAL PF_UNIX
+#endif
+#ifndef SUN_LEN
+#define SUN_LEN(su) \
+	(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+#endif
 
 static	BOOL	multi_threaded = NO;
 
diff --git a/Source/NSMessagePortNameServer.m b/Source/NSMessagePortNameServer.m
index f4d1f6b64..3c34e7483 100644
--- a/Source/NSMessagePortNameServer.m
+++ b/Source/NSMessagePortNameServer.m
@@ -15,6 +15,16 @@
 #include <string.h>
 #include <sys/un.h>
 
+/* Older systems (Solaris) compatibility */
+#ifndef AF_LOCAL
+#define AF_LOCAL AF_UNIX
+#define PF_LOCAL PF_UNIX
+#endif
+#ifndef SUN_LEN
+#define SUN_LEN(su) \
+	(sizeof(*(su)) - sizeof((su)->sun_path) + strlen((su)->sun_path))
+#endif
+
 
 static NSRecursiveLock *serverLock = nil;
 static NSMessagePortNameServer *defaultServer = nil;
diff --git a/gnustep-base.spec.in b/gnustep-base.spec.in
index 7518759d8..16aeda784 100644
--- a/gnustep-base.spec.in
+++ b/gnustep-base.spec.in
@@ -3,7 +3,7 @@ Source: 	ftp://ftp.gnustep.org/pub/gnustep/core/%{gs_name}-%{gs_version}.tar.gz
 Copyright: 	LGPL
 Group: 		Development/Libraries
 Summary: 	GNUstep Base library package
-Packager:	Adam Fedor <fedor@gnu.org>
+Packager:       GNUstep Development <bug-gnustep@gnu.org>
 Vendor:		The GNUstep Project
 URL:		http://www.gnustep.org/
 Requires:	gnustep-make >= 1.7.0