diff --git a/ChangeLog b/ChangeLog
index ad45d846f..8ad0c35b5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2002-06-03  Adam Fedor  <fedor@gnu.org>
+
+	* Source/GSDisplayServer.m (-beep): New method.
+	* Source/NSGraphicsContext.m (-NSBeep): Use it.
+
 2002-06-02  Alexander Malmberg  <alexander@malmberg.org>
 
 	Add basic color picker bundles: the wheel color picker and the
diff --git a/Headers/gnustep/gui/GSDisplayServer.h b/Headers/gnustep/gui/GSDisplayServer.h
index 49eaa1059..174a70221 100644
--- a/Headers/gnustep/gui/GSDisplayServer.h
+++ b/Headers/gnustep/gui/GSDisplayServer.h
@@ -87,6 +87,8 @@ APPKIT_DECLARE NSString * GSScreenNumber;
 
 - (void *) serverDevice;
 - (void *) windowDevice: (int)win;
+
+- (void) beep;
 @end
 
 /* ----------------------------------------------------------------------- */
diff --git a/Source/GSDisplayServer.m b/Source/GSDisplayServer.m
index c80b0485b..870a14ef7 100644
--- a/Source/GSDisplayServer.m
+++ b/Source/GSDisplayServer.m
@@ -423,6 +423,12 @@ GSCurrentServer(void)
   return NULL;
 }
 
+/** Play the System Beep */
+- (void) beep
+{
+  [self subclassResponsibility: _cmd];
+}
+
 @end
 
 /* ----------------------------------------------------------------------- */
diff --git a/Source/NSGraphicsContext.m b/Source/NSGraphicsContext.m
index d8eca9247..681ee4170 100644
--- a/Source/NSGraphicsContext.m
+++ b/Source/NSGraphicsContext.m
@@ -1310,6 +1310,8 @@ NSGraphicsContext	*GSCurrentContext()
 
 @end
 
+#include <AppKit/GSDisplayServer.h>
+
 /* ----------------------------------------------------------------------- */
 /* NSGraphics Ops */	
 /* ----------------------------------------------------------------------- */
@@ -1338,7 +1340,7 @@ NSGraphicsContext	*GSCurrentContext()
 /** Play the System Beep */
 - (void) NSBeep
 {
-  [self subclassResponsibility: _cmd];
+  [GSCurrentServer() beep];
 }
 
 /** This method is used by the backend, but has been rendered obsolete.