diff --git a/ChangeLog b/ChangeLog
index 8a4c5391..7372a9a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-07-17 Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* main.c: Use mem->desc in place of upd->memtype in more places to
+	give the full name of the respective memory area, instead of
+	the (possibly abbreviated) name the user typed in the -U option.
+
 2006-07-16 Joerg Wunsch <j@uriah.heep.sax.de>
 
 	First stab at an implementation of the STK500 parallel programming
diff --git a/main.c b/main.c
index f98f8fa6..b0a2bee3 100644
--- a/main.c
+++ b/main.c
@@ -556,7 +556,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
      */
     if (quell_progress < 2) {
       fprintf(stderr, "%s: writing %s (%d bytes):\n", 
-            progname, upd->memtype, size);
+            progname, mem->desc, size);
 	  }
 
     if (!nowrite) {
@@ -582,7 +582,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
 
     if (quell_progress < 2) {
       fprintf(stderr, "%s: %d bytes of %s written\n", progname, 
-            vsize, upd->memtype);
+            vsize, mem->desc);
     }
 
   }
@@ -614,7 +614,7 @@ int do_op(PROGRAMMER * pgm, struct avrpart * p, UPDATE * upd, int nowrite,
       fprintf(stderr, "%s: input file %s contains %d bytes\n", 
             progname, upd->filename, size);
       fprintf(stderr, "%s: reading on-chip %s data:\n", 
-            progname, upd->memtype);
+            progname, mem->desc);
     }
 
     report_progress (0,1,"Reading");