diff --git a/avrdude/ChangeLog b/avrdude/ChangeLog
index 7b411aea..08416f61 100644
--- a/avrdude/ChangeLog
+++ b/avrdude/ChangeLog
@@ -1,3 +1,9 @@
+2005-09-16  Joerg Wunsch <j@uriah.heep.sax.de>
+
+	* avrdude.1: document the memtypes for -U
+	* doc/avrdude.texi: (Ditto.)
+	Closes bug #13501: <memtype> should be listed in the man page
+
 2005-09-16  Joerg Wunsch <j@uriah.heep.sax.de>
 
 	* doc/Makefile.am: add logic to detect the misf^H^H^H^H
diff --git a/avrdude/avrdude.1 b/avrdude/avrdude.1
index 0bca1bdf..be34ba84 100644
--- a/avrdude/avrdude.1
+++ b/avrdude/avrdude.1
@@ -357,7 +357,39 @@ the fuse bits.
 .Xc
 Perform a memory operation as indicated.  The
 .Ar memtype
-field specifies the memory type to operate on.  The
+field specifies the memory type to operate on.
+The available memory types are device-dependant, the actual
+configuration can be viewed with the
+.Cm part
+command in terminal mode.
+Typically, a device's memory configuration at least contains
+the memory types
+.Ar flash
+and
+.Ar eeprom .
+All memory types currently known are:
+.Bl -tag -width "calibration" -compact
+.It calibration
+One or more bytes of RC oscillator calibration data.
+.It eeprom
+The EEPROM of the device.
+.It efuse
+The extended fuse byte.
+.It flash
+The flash ROM of the device.
+.It fuse
+The fuse byte in devices that have only a single fuse byte.
+.It hfuse
+The high fuse byte.
+.It lfuse
+The low fuse byte.
+.It lock
+The lock byte.
+.It signature
+The three device signature bytes (device ID).
+.El
+.Pp
+The
 .Ar op
 field specifies what operation to perform:
 .Bl -tag -width noreset
diff --git a/avrdude/doc/avrdude.texi b/avrdude/doc/avrdude.texi
index 29958075..ddbd9d67 100644
--- a/avrdude/doc/avrdude.texi
+++ b/avrdude/doc/avrdude.texi
@@ -572,6 +572,33 @@ mulitple memories on the same command-line invocation.  The
 the @option{-v} option on the command line or the @code{part} command from
 terminal mode to display all the memory types supported by a particular
 device.
+Typically, a device's memory configuration at least contains
+the memory types
+@code{flash}
+and
+@code{eeprom}.
+All memory types currently known are:
+@table @code
+@item calibration
+One or more bytes of RC oscillator calibration data.
+@item eeprom
+The EEPROM of the device.
+@item efuse
+The extended fuse byte.
+@item flash
+The flash ROM of the device.
+@item fuse
+The fuse byte in devices that have only a single fuse byte.
+@item hfuse
+The high fuse byte.
+@item lfuse
+The low fuse byte.
+@item lock
+The lock byte.
+@item signature
+The three device signature bytes (device ID).
+@end table
+
 The @var{op} field specifies what operation to perform:
 
 @table @code