diff --git a/awful.lua b/awful.lua
index 9b2fef2d..28888b41 100644
--- a/awful.lua
+++ b/awful.lua
@@ -469,11 +469,20 @@ local function escape(text)
     text = text:gsub("&", "&")
     text = text:gsub("<", "&lt;")
     text = text:gsub(">", "&gt;")
-    text = text:gsub("\\", "&apos;")
+    text = text:gsub("'", "&apos;")
     text = text:gsub("\"", "&quot;")
     return text
 end
 
+local function unescape(text)
+    text = text:gsub("&amp;", "&")
+    text = text:gsub("&lt;", "<")
+    text = text:gsub("&gt;", ">")
+    text = text:gsub("&apos;", "'")
+    text = text:gsub("&quot;", "\"")
+    return text
+end
+
 -- Export tags function
 P.tag =
 {