diff --git a/ChangeLog b/ChangeLog
index 3411462215..75ffeed52e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-01-05  Tor Lillqvist  <tml@novell.com>
+
+	Bug 566628 - gdk_display_close always asserts on win32
+
+	* gdk/win32/gdkdisplay-win32.c
+	(_gdk_windowing_set_default_display): Allow also a NULL parameter
+	in the g_assert(). Still don't actually do anything in this
+	function, though.
+
 2009-01-04  Matthias Clasen  <mclasen@redhat.com>
 
 	Bug 566568 – gtk_tree_model_get_value docs typo
diff --git a/gdk/win32/gdkdisplay-win32.c b/gdk/win32/gdkdisplay-win32.c
index 4d70897a2b..8bdb9331e0 100644
--- a/gdk/win32/gdkdisplay-win32.c
+++ b/gdk/win32/gdkdisplay-win32.c
@@ -33,7 +33,7 @@
 void
 _gdk_windowing_set_default_display (GdkDisplay *display)
 {
-  g_assert (_gdk_display == display);
+  g_assert (display == NULL || _gdk_display == display);
 }
 
 #ifdef HAVE_MONITOR_INFO