diff --git a/ChangeLog b/ChangeLog
index 29e317f94..d192ae418 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -89,6 +89,9 @@
    - deraadt@cvs.openbsd.org 2006/03/20 18:27:50
      [monitor.c]
      spacing
+   - deraadt@cvs.openbsd.org 2006/03/20 18:35:12
+     [channels.c]
+     x11_fake_data is only ever used as u_char *
 
 20060325
  - OpenBSD CVS Sync
@@ -4346,4 +4349,4 @@
    - (djm) Trim deprecated options from INSTALL. Mention UsePAM
    - (djm) Fix quote handling in sftp; Patch from admorten AT umich.edu
 
-$Id: ChangeLog,v 1.4267 2006/03/26 03:07:52 djm Exp $
+$Id: ChangeLog,v 1.4268 2006/03/26 03:08:10 djm Exp $
diff --git a/channels.c b/channels.c
index d16493001..239da8e9b 100644
--- a/channels.c
+++ b/channels.c
@@ -128,7 +128,7 @@ static u_int x11_saved_data_len = 0;
  * Fake X11 authentication data.  This is what the server will be sending us;
  * we should replace any occurrences of this by the real data.
  */
-static char *x11_fake_data = NULL;
+static u_char *x11_fake_data = NULL;
 static u_int x11_fake_data_len;