diff --git a/ChangeLog b/ChangeLog
index a80ed70b01..f69f074517 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2008-06-14  Cody Russell  <bratsche@gnome.org>
+
+	* gdk/win32/gdkselection-win32.c (gdk_win32_selection_add_targets):
+
+	Initialize hwnd to NULL.  This fixes OpenClipboard() failure and,
+	according to MSDN docs, associates the open clipboard with the
+	current task.  (#378158, reported by Andreas Köhler)
+
 2008-06-13  Matthias Clasen  <mclasen@redhat.com>
 
 	* configure.in: Bump version
diff --git a/gdk/win32/gdkselection-win32.c b/gdk/win32/gdkselection-win32.c
index 01e2d7f58f..7e9c8d9710 100644
--- a/gdk/win32/gdkselection-win32.c
+++ b/gdk/win32/gdkselection-win32.c
@@ -1028,7 +1028,7 @@ gdk_win32_selection_add_targets (GdkWindow  *owner,
 				 gint	     n_targets,
 				 GdkAtom    *targets)
 {
-  HWND hwnd;
+  HWND hwnd = NULL;
   guint formatid;
   gint i;
   GSList *convertable_formats, *format;