diff --git a/winsup/cygwin/ChangeLog b/winsup/cygwin/ChangeLog
index 0ab6b8f12..7c5d314ff 100644
--- a/winsup/cygwin/ChangeLog
+++ b/winsup/cygwin/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-04  Christopher Faylor  <cgf@timesys.com>
+
+	* fhandler_clipboard.cc: Use int for cygnativeformat rather than UINT
+	as that is what is returned by GetPriorityClipboardFormat.
+	(fhandler_dev_clipboard::read): Ditto for the format variable.
+
 2005-03-04  Corinna Vinschen  <corinna@vinschen.de>
 
 	* fhandler.cc (fhandler_base::open_9x): Satisfy query_open values.
diff --git a/winsup/cygwin/fhandler_clipboard.cc b/winsup/cygwin/fhandler_clipboard.cc
index 25ed1ddc9..fab1424be 100644
--- a/winsup/cygwin/fhandler_clipboard.cc
+++ b/winsup/cygwin/fhandler_clipboard.cc
@@ -30,7 +30,7 @@ details. */
 
 static const NO_COPY char *CYGWIN_NATIVE = "CYGWIN_NATIVE_CLIPBOARD";
 /* this is MT safe because windows format id's are atomic */
-static UINT cygnativeformat;
+static int cygnativeformat;
 
 fhandler_dev_clipboard::fhandler_dev_clipboard ()
   : fhandler_base (), pos (0), membuffer (NULL), msize (0),
@@ -190,7 +190,7 @@ fhandler_dev_clipboard::read (void *ptr, size_t& len)
   HGLOBAL hglb;
   size_t ret;
   UINT formatlist[2];
-  UINT format;
+  int format;
   if (eof)
     len = 0;
   else