Index: firmware/powermgmt.c
===================================================================
--- firmware/powermgmt.c	(revision 13167)
+++ firmware/powermgmt.c	(working copy)
@@ -190,6 +190,8 @@
     105, 115
 #elif CONFIG_BATTERY == BATT_LIPOL1300  /* iRiver H1x0: LiPolymer */
     338
+#elif CONFIG_BATTERY == BATT_LIPOL340   /* ipod nano */
+    333
 #elif CONFIG_BATTERY == BATT_LIION750   /* Sansa e200 */
     340
 #elif CONFIG_BATTERY == BATT_LIION830   /* Gigabeat F */
@@ -213,6 +215,8 @@
     270, 280
 #elif CONFIG_BATTERY == BATT_LIPOL1300  /* iRiver Hxxx */
     302
+#elif CONFIG_BATTERY == BATT_LIPOL340   /* ipod nano */
+    323
 #elif CONFIG_BATTERY == BATT_LIION750   /* Sansa e200 */
     330
 #elif CONFIG_BATTERY == BATT_LIION830   /* Gigabeat F */
@@ -261,6 +265,9 @@
 #elif CONFIG_BATTERY == BATT_LIION750
     /* Sansa Li Ion 750mAH FIXME this is a first linear approach */
     { 330, 339, 348, 357, 366, 375, 384, 393, 402, 411, 420 },
+#elif CONFIG_BATTERY == BATT_LIPOL340
+    /* measured values */
+    { 323, 362, 370, 373, 375, 378, 383, 389, 395, 403, 416 }
 #else /* NiMH */
     /* original values were taken directly after charging, but it should show
        100% after turning off the device for some hours, too */
Index: firmware/export/config-ipodnano.h
===================================================================
--- firmware/export/config-ipodnano.h	(revision 13167)
+++ firmware/export/config-ipodnano.h	(working copy)
@@ -66,7 +66,7 @@
 /* We can fade the backlight by using PWM */
 #define HAVE_BACKLIGHT_PWM_FADING
 
-#define BATTERY_CAPACITY_DEFAULT 1300 /* default battery capacity */
+#define BATTERY_CAPACITY_DEFAULT 340 /* default battery capacity */
 
 #ifndef SIMULATOR
 
@@ -79,12 +79,13 @@
 #define CONFIG_I2C I2C_PP5020
 
 /* Type of mobile power */
-#define CONFIG_BATTERY BATT_LIPOL1300
-#define BATTERY_CAPACITY_MIN 1300 /* min. capacity selectable */
-#define BATTERY_CAPACITY_MAX 3200 /* max. capacity selectable */
-#define BATTERY_CAPACITY_INC 50   /* capacity increment */
+#define CONFIG_BATTERY BATT_LIPOL340
+#define BATTERY_CAPACITY_MIN 330 /* min. capacity selectable */
+#define BATTERY_CAPACITY_MAX 400 /* max. capacity selectable */
+#define BATTERY_CAPACITY_INC 10   /* capacity increment */
 #define BATTERY_TYPES_COUNT  1    /* only one type */
-#define BATTERY_SCALE_FACTOR 5865
+/* value calculated using multimeter and may not be correct */
+#define BATTERY_SCALE_FACTOR 5840
 
 /* Hardware controlled charging? FIXME */
 //#define CONFIG_CHARGING CHARGING_SIMPLE
Index: firmware/export/config.h
===================================================================
--- firmware/export/config.h	(revision 13167)
+++ firmware/export/config.h	(working copy)
@@ -78,6 +78,7 @@
 #define BATT_BP009        820 /* iriver H10 5/6Gb - iriver BP009 */
 #define BATT_LIION830     830 /* Toshiba Gigabeat Fxx and Xxx series MK11-2740 */
 #define BATT_LIION750     750 /* Sansa e200 LiIon 3,7V */
+#define BATT_LIPOL340     340 /* ipod nano */
 #define BATT_1AA          333 /* iRiver iFP: Alkaline, NiHM */
 
 /* CONFIG_CHARGING */