diff --git a/ChangeLog b/ChangeLog
index 67ce4348f..1c773d57c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2012-08-27 Rolf Bensch <rolf at bensch hyphen online dot de>
+	* backend/pixma_mp150.c, doc/descriptions/pixma.desc, doc/sane-pixma.man:
+	Pixma MG6100 support reported by Yann Bonnamy. Bug #313471.
+
 2012-08-26 m. allan noah <kitno455 at gmail dot com>
 	* ChangeLog*, configure*, Makefile.in, doc/desc/{kodakaio,kvs40xx}.desc:
 	Various updates related to starting 1.0.24git 
diff --git a/backend/pixma_mp150.c b/backend/pixma_mp150.c
index 3f24f2d47..13f53d1cb 100644
--- a/backend/pixma_mp150.c
+++ b/backend/pixma_mp150.c
@@ -1632,7 +1632,7 @@ const pixma_config_t pixma_mp150_devices[] = {
   DEVICE ("Canon PIXMA MP495",  "MP495",  MP495_PID,  1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA MG5100", "MG5100", MG5100_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
   DEVICE ("Canon PIXMA MG5200", "MG5200", MG5200_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),
-  DEVICE ("Canon PIXMA MG6100", "MG6200", MG6100_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),
+  DEVICE ("Canon PIXMA MG6100", "MG6100", MG6100_PID, 2400, 0, 0, 638, 877, PIXMA_CAP_CIS),
 
   /* Latest devices (2011) Generation 4 CIS/CCD */
   DEVICE ("Canon PIXMA MG2100", "MG2100", MG2100_PID, 1200, 0, 0, 638, 877, PIXMA_CAP_CIS),
diff --git a/doc/descriptions/pixma.desc b/doc/descriptions/pixma.desc
index 364d353d1..55f58b852 100644
--- a/doc/descriptions/pixma.desc
+++ b/doc/descriptions/pixma.desc
@@ -75,8 +75,8 @@
 :model "PIXMA MG6100 Series"
 :interface "USB"
 :usbid "0x04a9" "0x174a"
-:status :untested
-:comment "Testers needed!"
+:status :complete
+:comment "All resolutions supported (up to 2400 DPI)"
 
 :model "PIXMA MG6200 Series"
 :interface "USB"
diff --git a/doc/sane-pixma.man b/doc/sane-pixma.man
index 60d6467f5..8fc19d990 100644
--- a/doc/sane-pixma.man
+++ b/doc/sane-pixma.man
@@ -1,4 +1,4 @@
-.TH "sane\-pixma" "5" "25 Aug 2012" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
+.TH "sane\-pixma" "5" "27 Aug 2012" "@PACKAGEVERSION@" "SANE Scanner Access Now Easy"
 .IX sane\-pixma
 .SH NAME
 .B sane\-pixma 
@@ -17,6 +17,8 @@ using Canon's BJNP protocol.
 Currently, the following models work with this backend:
 .PP
 .RS
+PIXMA MG6100
+.br
 PIXMA MP140, MP150, MP160, MP170, MP180, MP190
 .br
 PIXMA MP210, MP220, MP240, MP250, MP260, MP270, MP280
@@ -75,7 +77,7 @@ PIXMA E500, E600
 .br
 PIXMA MG2100, MG3100, MG4100, MG5100, MG5200, MG5300 
 .br
-PIXMA MG6100, MG6200, MG8100, MG8200
+PIXMA MG6200, MG8100, MG8200
 .br
 PIXMA MP375R, MP493, MP495, MP740
 .br