diff --git a/src/framework/core/application.cpp b/src/framework/core/application.cpp
index 5c27cd97..b83448bf 100644
--- a/src/framework/core/application.cpp
+++ b/src/framework/core/application.cpp
@@ -34,6 +34,14 @@
 #include <framework/net/connection.h>
 #endif
 
+/* Ugly hack but works.  */
+#if defined __APPLE__ && defined CRASH_HANDLER
+/* UNIX Crash handler for some reason did not go as expected on a Mac system
+ * TODO: RTFM it.
+ */
+#undef CRASH_HANDLER
+#endif
+
 void exitSignalHandler(int sig)
 {
     static bool signaled = false;
diff --git a/src/framework/platform/x11window.cpp b/src/framework/platform/x11window.cpp
index 1cbacc00..6fc6882b 100644
--- a/src/framework/platform/x11window.cpp
+++ b/src/framework/platform/x11window.cpp
@@ -20,7 +20,7 @@
  * THE SOFTWARE.
  */
 
-#ifdef __linux
+#if defined __linux || defined __APPLE__
 
 #include "x11window.h"
 #include <framework/core/resourcemanager.h>