diff --git a/extra/batsys.lua b/extra/batproc.lua
similarity index 51%
rename from extra/batsys.lua
rename to extra/batproc.lua
index 654c899..2316f03 100644
--- a/extra/batsys.lua
+++ b/extra/batproc.lua
@@ -1,72 +1,73 @@
 ---------------------------------------------------
 -- Licensed under the GNU General Public License v2
 --  * (c) 2009, Adrian C. <anrxc@sysphere.org>
---  * (c) 2009, Benedikt Sauer <filmor@gmail.com>
 ---------------------------------------------------
 
 -- {{{ Grab environment
 local tonumber = tonumber
 local io = { open = io.open }
 local setmetatable = setmetatable
-local string = { format = string.format }
 local math = {
     min = math.min,
     floor = math.floor
 }
+local string = {
+    find = string.find,
+    match = string.match,
+    format = string.format
+}
 -- }}}
 
 
--- Batsys: provides state, charge, and remaining time for a requested battery using sysfs
-module("vicious.batsys")
+-- Batproc: provides state, charge, and remaining time for a requested battery using procfs
+module("vicious.widgets.batproc")
 
 
 -- {{{ Battery widget type
 local function worker(format, batid)
-    local battery = setmetatable({}, {__index = function(table, name)
-        local f = io.open("/sys/class/power_supply/"..batid.."/"..name)
-        if f then
-            local s = f:read("*all")
-            f:close()
-            return s
-        end
-    end})
-
     local battery_state = {
-        ["Full\n"] = "↯",
-        ["Unknown\n"] = "⌁",
-        ["Charged\n"] = "↯",
-        ["Charging\n"] = "+",
-        ["Discharging\n"] = "-"
+        ["full"] = "↯",
+        ["unknown"] = "⌁",
+        ["charged"] = "↯",
+        ["charging"] = "+",
+        ["discharging"] = "-"
     }
 
+    -- Get /proc/acpi/battery info
+    local f = io.open("/proc/acpi/battery/"..batid.."/info")
+    -- Handler for incompetent users
+    if not f then return {battery_state["unknown"], 0, "N/A"} end
+    local infofile = f:read("*all")
+    f:close()
+
     -- Check if the battery is present
-    if not battery.present == "1\n" then
-        return {battery_state["Unknown\n"], 0, "N/A"}
+    if infofile == nil or string.find(infofile, "present:[%s]+no") then
+        return {battery_state["unknown"], 0, "N/A"}
     end
 
-
-    -- Get state information
-    local state = battery_state[battery.status] or battery_state["Unknown\n"]
-
     -- Get capacity information
-    if battery.charge_now then
-        remaining, capacity = battery.charge_now, battery.charge_full
-    elseif battery.energy_now then
-        remaining, capacity = battery.energy_now, battery.energy_full
-    else
-        return {battery_state["Unknown\n"], 0, "N/A"}
-    end
+    local capacity = string.match(infofile, "last full capacity:[%s]+([%d]+).*")
+
+
+    -- Get /proc/acpi/battery state
+    local f = io.open("/proc/acpi/battery/"..batid.."/state")
+    local statefile = f:read("*all")
+    f:close()
+
+    -- Get state information
+    local state = string.match(statefile, "charging state:[%s]+([%a]+).*")
+    local state = battery_state[state] or battery_state["unknown"]
 
     -- Get charge information
-    if battery.current_now then rate = battery.current_now
-    else return {battery_state["Unknown\n"], 0, "N/A"} end
+    local rate = string.match(statefile, "present rate:[%s]+([%d]+).*")
+    local remaining = string.match(statefile, "remaining capacity:[%s]+([%d]+).*")
 
 
     -- Calculate percentage (but work around broken BAT/ACPI implementations)
     local percent = math.min(math.floor(remaining / capacity * 100), 100)
 
     -- Calculate remaining (charging or discharging) time
-    if state == "+"then
+    if state == "+" then
         timeleft = (tonumber(capacity) - tonumber(remaining)) / tonumber(rate)
     elseif state == "-" then
         timeleft = tonumber(remaining) / tonumber(rate)