diff --git a/util/ChangeLog b/util/ChangeLog
index d151326d1..d31de6a59 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,8 @@
+2004-08-19  David Shaw  <dshaw@jabberwocky.com>
+
+	* http.c (insert_escapes): Fix encoding problem for non-URI-safe
+	characters.  Noted by Vladimir Novak.
+
 2004-08-11  Werner Koch  <wk@g10code.de>
 
 	* dotlock.c (destroy_dotlock): New.
diff --git a/util/http.c b/util/http.c
index 39bbbfe32..12c98016a 100644
--- a/util/http.c
+++ b/util/http.c
@@ -1,5 +1,5 @@
 /* http.c  -  HTTP protocol handler
- *	Copyright (C) 1999, 2001, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 1999, 2001, 2003, 2004 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *
@@ -420,7 +420,7 @@ insert_escapes( byte *buffer, const byte *string, const byte *special )
 	}
 	else {
 	    if( buffer ) {
-		sprintf( buffer, "%02X", *string );
+		sprintf( buffer, "%%%02X", *string );
 		buffer += 3;
 	    }
 	    n += 3;
@@ -430,9 +430,6 @@ insert_escapes( byte *buffer, const byte *string, const byte *special )
 }
 
 
-
-
-
 static URI_TUPLE
 parse_tuple( byte *string )
 {