diff --git a/dub.sdl b/dub.sdl
index 404196b9..67a7ac8b 100644
--- a/dub.sdl
+++ b/dub.sdl
@@ -187,7 +187,7 @@ subPackage {
 	name "x11"
 	targetType "sourceLibrary"
 	dependency "ae" version="*" path="."
-	dependency "libx11" version="0.0.1"
+	dependency "libx11" version="0.0.2"
 	sourceFiles \
 		"sys/sendinput.d" \
 		"net/x11/*"
diff --git a/net/x11/package.d b/net/x11/package.d
index 2431150b..709c2ad5 100644
--- a/net/x11/package.d
+++ b/net/x11/package.d
@@ -1131,23 +1131,7 @@ private:
 		EventSpec!(SelectionRequest, simpleDecoder!(xEvent.SelectionRequest)),
 		EventSpec!(SelectionNotify , simpleDecoder!(xEvent.SelectionNotify )),
 		EventSpec!(ColormapNotify  , simpleDecoder!(xEvent.Colormap        )),
-		EventSpec!(ClientMessage   ,
-			function(
-				Data data,
-			) {
-				auto reader = DataReader(data);
-				auto packet = *reader.read!(xEvent.ClientMessage)().enforce("Unexpected reply size");
-				struct Result
-				{
-					Atom type;
-					ubyte[20] bytes;
-				}
-				return Result(
-					packet.b.type,
-					cast(ubyte[20])packet.b.bytes,
-				);
-			}
-		),
+		EventSpec!(ClientMessage   , simpleDecoder!(xEvent.ClientMessage   )),
 		EventSpec!(MappingNotify   , simpleDecoder!(xEvent.MappingNotify   )),
 	//	EventSpec!(GenericEvent    , simpleDecoder!(xGenericEvent          )),
 	);