diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index d7414119..b1caf313 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,11 @@
+2009-07-11  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
+
+	Submitted by Roger Wolff:
+	bug #26527: bug in unicode conversion
+	* ser_avrdoper.c (convertUniToAscii): when encountering a UTF-16
+	character that cannot be converted to ASCII, increment the UTF-16
+	pointer anyway when proceeding.
+
 2009-07-11  Joerg Wunsch <j.gnu@uriah.heep.sax.de>
 
 	* jtagmkI.c (jtagmkI_send): Replace %zd format by %u since not all
diff --git a/avrdude/ser_avrdoper.c b/avrdude/ser_avrdoper.c
index eb537ad1..ad3564ad 100644
--- a/avrdude/ser_avrdoper.c
+++ b/avrdude/ser_avrdoper.c
@@ -92,6 +92,7 @@ static void convertUniToAscii(char *buffer)
     while(*uni != 0){
         if(*uni >= 256){
             *ascii++ = '?';
+            uni++;
         }else{
             *ascii++ = *uni++;
         }