diff --git a/README.md b/README.md
index 2e435353a..5a7bca5a1 100644
--- a/README.md
+++ b/README.md
@@ -31,8 +31,16 @@ To get and compile the source you must have `patch`, `wget`, `unzip`, `git`,
 
 Version of autoconf need to be greater than 2.64.
 
-You might also need SDL library packages if you want to compile and run the PC
-emulator. Fedora users can install `SDL` and `SDL-devel`. Ubuntu users can
+Cross toolchains are available to Ubuntu users through these commands:
+```
+# building for Kindle
+sudo apt-get install gcc-arm-linux-gnueabi g++-arm-linux-gnueabi
+# building for Kobo
+sudo apt-get install gcc-arm-linux-gnueabihf g++-arm-linux-gnueabihf
+```
+
+You might also need SDL library packages if you want to compile and run 
+Koreader on PC. Fedora users can install `SDL` and `SDL-devel`. Ubuntu users can
 install `libsdl1.2-dev`.
 
 
diff --git a/frontend/ui/device/kindlepowerd.lua b/frontend/ui/device/kindlepowerd.lua
index ce9e4a1bb..cd5c8b5da 100644
--- a/frontend/ui/device/kindlepowerd.lua
+++ b/frontend/ui/device/kindlepowerd.lua
@@ -3,8 +3,8 @@ local BasePowerD = require("ui/device/basepowerd")
 
 local KindlePowerD = BasePowerD:new{
 	fl_min = 0, fl_max = 24,
-	-- FIXME: Check how to handle this on the PW2, initial reports on IRC suggest that this isn't possible anymore
-	kpw_frontlight = "/sys/devices/system/fl_tps6116x/fl_tps6116x0/fl_intensity",
+	kpw1_frontlight = "/sys/devices/system/fl_tps6116x/fl_tps6116x0/fl_intensity",
+	kpw2_frontlight = "/sys/class/backlight/max77696-bl/brightness",
 	kt_kpw_capacity = "/sys/devices/system/yoshi_battery/yoshi_battery0/battery_capacity",
 	kpw_charging = "/sys/devices/platform/aplite_charger.0/charging",
 	kt_charging = "/sys/devices/platform/fsl-usb2-udc/charging",
@@ -32,8 +32,12 @@ function KindlePowerD:init(model)
 	if model == "KindleTouch" then
 		self.batt_capacity_file = self.kt_kpw_capacity
 		self.is_charging_file = self.kt_charging
-	elseif model == "KindlePaperWhite" or model == "KindlePaperWhite2" then
-		self.fl_intensity_file = self.kpw_frontlight
+	elseif model == "KindlePaperWhite" then
+		self.fl_intensity_file = self.kpw1_frontlight
+		self.batt_capacity_file = self.kt_kpw_capacity
+		self.is_charging_file = self.kpw_charging
+	elseif model == "KindlePaperWhite2" then
+		self.fl_intensity_file = self.kpw2_frontlight
 		self.batt_capacity_file = self.kt_kpw_capacity
 		self.is_charging_file = self.kpw_charging
 	end
diff --git a/koreader-base b/koreader-base
index b31c920b4..56532d7d0 160000
--- a/koreader-base
+++ b/koreader-base
@@ -1 +1 @@
-Subproject commit b31c920b45427d92b7ad4977fd9644e9a9c0d185
+Subproject commit 56532d7d0655352dfa9e762a7e260cc4b55b5b47