diff --git a/ChangeLog b/ChangeLog
index d369b3d95..c83f7d5d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Aug  8 23:26:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
+	explicit calls to pango_x/xft_shutdown_display() since
+	Pango now does it by itself on XCloseDisplay().
+
 Thu Aug  8 21:53:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Consistently order pangoxft / pangox
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d369b3d95..c83f7d5d4 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Aug  8 23:26:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
+	explicit calls to pango_x/xft_shutdown_display() since
+	Pango now does it by itself on XCloseDisplay().
+
 Thu Aug  8 21:53:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Consistently order pangoxft / pangox
diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index d369b3d95..c83f7d5d4 100644
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,9 @@
+Thu Aug  8 23:26:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
+	explicit calls to pango_x/xft_shutdown_display() since
+	Pango now does it by itself on XCloseDisplay().
+
 Thu Aug  8 21:53:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Consistently order pangoxft / pangox
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d369b3d95..c83f7d5d4 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,9 @@
+Thu Aug  8 23:26:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
+	explicit calls to pango_x/xft_shutdown_display() since
+	Pango now does it by itself on XCloseDisplay().
+
 Thu Aug  8 21:53:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Consistently order pangoxft / pangox
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d369b3d95..c83f7d5d4 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,9 @@
+Thu Aug  8 23:26:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
+	explicit calls to pango_x/xft_shutdown_display() since
+	Pango now does it by itself on XCloseDisplay().
+
 Thu Aug  8 21:53:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Consistently order pangoxft / pangox
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d369b3d95..c83f7d5d4 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Aug  8 23:26:05 2002  Owen Taylor  <otaylor@redhat.com>
+
+	* gdk/x11/gdkmain-x11.c gdk/x11/gdkscreen-x11.c: Remove
+	explicit calls to pango_x/xft_shutdown_display() since
+	Pango now does it by itself on XCloseDisplay().
+
 Thu Aug  8 21:53:16 2002  Owen Taylor  <otaylor@redhat.com>
 
 	* configure.in: Consistently order pangoxft / pangox
diff --git a/gdk/x11/gdkmain-x11.c b/gdk/x11/gdkmain-x11.c
index 06e92d53d..2a7e49d25 100644
--- a/gdk/x11/gdkmain-x11.c
+++ b/gdk/x11/gdkmain-x11.c
@@ -494,7 +494,6 @@ _gdk_windowing_exit (void)
     
   while (tmp_list)
     {
-      pango_x_shutdown_display (GDK_DISPLAY_XDISPLAY (tmp_list->data));
       XCloseDisplay (GDK_DISPLAY_XDISPLAY (tmp_list->data));
       
       tmp_list = tmp_list->next;
diff --git a/gdk/x11/gdkscreen-x11.c b/gdk/x11/gdkscreen-x11.c
index d15e7b8af..9e0d18996 100644
--- a/gdk/x11/gdkscreen-x11.c
+++ b/gdk/x11/gdkscreen-x11.c
@@ -238,10 +238,6 @@ gdk_screen_x11_dispose (GObject *object)
 {
   GdkScreenX11 *screen_x11 = GDK_SCREEN_X11 (object);
 
-  pango_x_shutdown_display (screen_x11->xdisplay);
-#ifdef HAVE_XFT  
-  pango_xft_shutdown_display (screen_x11->xdisplay, screen_x11->screen_num);
-#endif  
   _gdk_x11_events_uninit_screen (GDK_SCREEN (object));
   
   screen_x11->root_window = NULL;