diff --git a/lib/xcore.js b/lib/xcore.js
index 1b25aa5..17a4480 100644
--- a/lib/xcore.js
+++ b/lib/xcore.js
@@ -298,13 +298,20 @@ XClient.prototype.unpackEvent = function(type, seq, extra, code, raw)
     } else if (type == 17) { // destroy notify
         var values = raw.unpack('LL');
         event.name = 'DestroyNotify'
-        event.wid = extra;
-        event.wid1 = values[0];
+        event.event = extra;
+        event.wid = values[0];
+    } else if (type == 18) { // UnmapNotify
+        var values = raw.unpack('LLC');
+        event.name = 'UnmapNotify'
+        event.event = extra;
+        event.wid = values[0];
+        event.fromConfigure = values[1] ? true : false;
     } else if (type == 19) { // MapNotify
         var values = raw.unpack('LLC');
         event.name = 'MapNotify'
-        event.wid = extra;
-        event.wid1 = values[0];
+        event.event = extra;
+        event.wid = values[0];
+        event.overrideRedirect = values[1] ? true : false;
     } else if (type == 20) {
         var values = raw.unpack('LL');
         event.name = 'MapRequest'