diff --git a/client/Makefile b/client/Makefile
index 256e3719..d68d1564 100644
--- a/client/Makefile
+++ b/client/Makefile
@@ -26,7 +26,10 @@ OBJS	= main.o \
 
 BUILD_OBJS = $(foreach obj,$(OBJS),$(BUILD)/$(obj))
 
-all: $(BIN)/$(BINARY)
+all: $(BIN)/$(BINARY) $(BIN)/xlib-shim.so
+
+$(BIN)/xlib-shim.so:
+	gcc -fPIC $(CFLAGS) -shared -o $@ xlib-shim.c
 
 $(BUILD)/%.o: %.c
 	@mkdir -p $(dir $@)
diff --git a/client/xlib-shim.c b/client/xlib-shim.c
new file mode 100644
index 00000000..c3feb517
--- /dev/null
+++ b/client/xlib-shim.c
@@ -0,0 +1,15 @@
+#include <X11/Xlib.h>
+#include <stdbool.h>
+#include "debug.h"
+
+int XSync(Display * display, Bool discard)
+{
+  static bool doneInfo = false;
+  if (!doneInfo)
+  {
+    DEBUG_INFO("XSync Override Enabled");
+    doneInfo = true;
+  }
+
+  return 0;
+}
\ No newline at end of file