--- conky-1.8.1/src/linux.c	2010-10-05 22:29:36.000000000 +0100
+++ ./linux.c			2010-12-04 21:12:04.000000002 +0000
@@ -1549,6 +1549,12 @@
   On some systems POWER_SUPPLY_ENERGY_* is replaced by POWER_SUPPLY_CHARGE_*
 */
 
+/* Tiago Marques Vale <tiagomarquesvale@gmail.com>
+  Regarding the comment above, since kernel 2.6.36.1 I have
+  POWER_SUPPLY_POWER_NOW instead of POWER_SUPPLY_CURRENT_NOW
+  See http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=532000
+*/
+
 #define SYSFS_BATTERY_BASE_PATH "/sys/class/power_supply"
 #define ACPI_BATTERY_BASE_PATH "/proc/acpi/battery"
 #define APM_PATH "/proc/apm"
@@ -1671,6 +1677,8 @@
  			the tradition! */
  			else if (strncmp(buf, "POWER_SUPPLY_CURRENT_NOW=", 25) == 0)
  				sscanf(buf, "POWER_SUPPLY_CURRENT_NOW=%d", &present_rate);
+			else if (strncmp(buf, "POWER_SUPPLY_POWER_NOW=", 23) == 0)
+ 				sscanf(buf, "POWER_SUPPLY_POWER_NOW=%d", &present_rate);
  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_NOW=", 24) == 0)
  				sscanf(buf, "POWER_SUPPLY_ENERGY_NOW=%d", &remaining_capacity);
  			else if (strncmp(buf, "POWER_SUPPLY_ENERGY_FULL=", 25) == 0)
--- conky-1.8.1/src/xmms2.h	2010-10-05 23:29:36.000000000 +0200
+++ ./xmms2.h			2012-06-03 00:27:47.000000000 +0200
@@ -42,6 +42,7 @@
 	char *playlist;
 	int tracknr;
 	int bitrate;
+	int percent;
 	unsigned int id;
 	int duration;
 	int elapsed;
