Index: firmware/target/arm/ipod/powermgmt-ipod-pcf.c
===================================================================
--- firmware/target/arm/ipod/powermgmt-ipod-pcf.c	(revision 16276)
+++ firmware/target/arm/ipod/powermgmt-ipod-pcf.c	(working copy)
@@ -27,8 +27,12 @@
 #ifdef IPOD_NANO
     3330
 #elif defined IPOD_VIDEO
+#if MEM==32
     3300
 #else
+    3500
+#endif
+#else
     /* FIXME: calibrate value for other 3G+ ipods */
     3380
 #endif
@@ -39,8 +43,12 @@
 #ifdef IPOD_NANO
     3230
 #elif defined IPOD_VIDEO
+#if MEM==32
     3300
 #else
+    3400
+#endif
+#else
     /* FIXME: calibrate value for other 3G+ ipods */
     3020
 #endif
@@ -53,9 +61,14 @@
     /* measured values */
     { 3230, 3620, 3700, 3730, 3750, 3780, 3830, 3890, 3950, 4030, 4160 },
 #elif defined IPOD_VIDEO
+#if (MEM==32)
     /* iPOD Video 30GB Li-Ion 400mAh, first approach based upon measurements */
     { 3450, 3670, 3710, 3750, 3790, 3830, 3870, 3930, 4010, 4100, 4180 },
 #else
+    /* iPOD Video 60GB Li-Ion 600mAh */
+    { 3500, 3813, 3867, 3896, 3914, 3937, 4004, 4064, 4113, 4217, 4300 },
+#endif
+#else
     /* FIXME: calibrate value for other 3G+ ipods */
     /* Table is "inherited" from iriver H100. */
     { 3370, 3650, 3700, 3740, 3780, 3820, 3870, 3930, 4000, 4080, 4160 }
@@ -70,9 +83,14 @@
     /* measured values */
     3230, 3620, 3700, 3730, 3750, 3780, 3830, 3890, 3950, 4030, 4160
 #elif defined IPOD_VIDEO
+#if (MEM==32)
     /* iPOD Video 30GB Li-Ion 400mAh, first approach based upon measurements */
-    3450, 3670, 3710, 3750, 3790, 3830, 3870, 3930, 4010, 4100, 4180
+    3450, 3670, 3710, 3750, 3790, 3830, 3870, 3930, 4010, 4100, 4180,
 #else
+    /* iPOD Video 60GB Li-Ion 600mAh */
+    3500, 3813, 3867, 3896, 3914, 3937, 4004, 4064, 4113, 4217, 4300,
+#endif
+#else
     /* FIXME: calibrate value for other 3G+ ipods */
     /* Table is "inherited" from iriver H100. */
     3540, 3860, 3930, 3980, 4000, 4020, 4040, 4080, 4130, 4180, 4230