diff --git a/ChangeLog b/ChangeLog
index d420efc66e..15963ecde4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-08-24  Michael Natterer  <mitch@imendio.com>
+
+	* gdk/quartz/gdkdisplay-quartz.c (gdk_display_get_name): return
+	the hostname instead of NULL.
+
 2006-08-23  Matthias Clasen  <mclasen@redhat.com>
 
 	* gtk/gtkprinteroptionwidget.[hc]: Fix confusion about
diff --git a/gdk/quartz/gdkdisplay-quartz.c b/gdk/quartz/gdkdisplay-quartz.c
index fe15eb46c7..0fb75fcbf6 100644
--- a/gdk/quartz/gdkdisplay-quartz.c
+++ b/gdk/quartz/gdkdisplay-quartz.c
@@ -73,8 +73,12 @@ gdk_display_open (const gchar *display_name)
 G_CONST_RETURN gchar *
 gdk_display_get_name (GdkDisplay *display)
 {
-  /* FIXME: Implement */
-  return NULL;
+  static gchar *display_name = NULL;
+
+  if (! display_name)
+    display_name = g_strdup ([[[NSHost currentHost] name] UTF8String]);
+
+  return display_name;
 }
 
 int
@@ -157,4 +161,3 @@ gdk_display_store_clipboard (GdkDisplay *display,
 {
   /* FIXME: Implement */
 }
-