diff --git a/ChangeLog b/ChangeLog
index 0446d65e1..67f09fe81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-05-06  Hubert Figuiere  <hub@figuiere.net>
+
+	* camlibs/ptp2/library.c: Added Nikon P5100
+
 2008-04-20  Theodore Kilgore <kilgota@auburn.edu> 
 
 	* libgphoto2/bayer.h: gp_ahd_interpolate() and gp_ahd_decode() added.
diff --git a/NEWS b/NEWS
index 409a20bbd..548be3606 100644
--- a/NEWS
+++ b/NEWS
@@ -4,6 +4,7 @@ PTP2 driver:
    * Fixed bugs in packing of PTP arrays, unpack / pack 64 bit entities.
    * Devices added:
      - Canon IXUS iZ
+     - Nikon Coolpix P5100
      - <fill in from diff>
 
 Topfield driver:
@@ -116,11 +117,11 @@ PTP2 driver:
 
  	Canon PowerShot SD1000, SD900, A450, A550, A560, A570, A420, SD40, SD750
  	Canon PowerShot S5 IS, SD1000
-	Canon Digitial IXUS 70, 75, 900Ti
+	Canon Digitial IXUS 70, 75, 900Ti, iZ
 	Canon MV750i
 	Nikon CoolPix S4, S6, P4, L10
 	Nikon DSC D40, 
-	Kodak EasyShare C433, C613, C653, C743, C875, V570, V610, V705, P880, V603
+	Kodak EasyShare C433, C613, C653, C743, C875, V570, V610, V705, P880, V603, Z712 IS
 	HP Photosmart R967
 	Minolta DiMAGE x21
 	Fuji FinePix F20, F40, S9500
diff --git a/camlibs/ptp2/library.c b/camlibs/ptp2/library.c
index 99fd439ad..bdde834ac 100644
--- a/camlibs/ptp2/library.c
+++ b/camlibs/ptp2/library.c
@@ -539,6 +539,8 @@ static struct {
 	{"Nikon:Coolpix L12 (PTP mode)",  0x04b0, 0x015f, 0},
 	/* Marius Groeger <marius.groeger@web.de> */
 	{"Nikon:Coolpix S200 (PTP mode)", 0x04b0, 0x0161, PTP_CAP|PTP_NIKON_BROKEN_CAP},
+  /* Submitted on IRC by kallepersson */
+	{"Nikon:Coolpix P5100 (PTP mode)", 0x04b0, 0x0163, 0},
 	{"Nikon:Coolpix SQ (PTP mode)",   0x04b0, 0x0202, 0},
 	/* lars marowski bree, 16.8.2004 */
 	{"Nikon:Coolpix 4200 (PTP mode)", 0x04b0, 0x0204, 0},