diff --git a/Makefile.common b/Makefile.common
index f716af96fa..4b7edd0935 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -370,6 +370,9 @@ ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
    ifeq ($(HAVE_MATERIALUI),)
       HAVE_MATERIALUI = 1
    endif
+   ifeq ($(HAVE_WIMP),)
+      HAVE_WIMP = 1
+   endif
 
    ifeq ($(HAVE_XMB),)
       HAVE_XMB = 1
@@ -377,6 +380,7 @@ ifeq ($(HAVE_RGUI)$(HAVE_GL_CONTEXT), 11)
 else
    HAVE_ZARCH = 0
    HAVE_MATERIALUI  = 0
+   HAVE_WIMP = 0
    HAVE_XMB   = 0
 endif
 
@@ -388,6 +392,11 @@ ifeq ($(HAVE_MATERIALUI), 1)
    OBJ += menu/drivers/materialui.o
    DEFINES += -DHAVE_MATERIALUI
 endif
+ifeq ($(HAVE_WIMP), 1)
+   OBJ += deps/zahnrad/zahnrad.o
+   OBJ += menu/drivers/wimp.o
+   DEFINES += -DHAVE_WIMP
+endif
 ifeq ($(HAVE_ZARCH), 1)
    OBJ += menu/drivers/zarch.o
    DEFINES += -DHAVE_ZARCH
diff --git a/griffin/griffin.c b/griffin/griffin.c
index 592286bc44..8c2cbfd50e 100644
--- a/griffin/griffin.c
+++ b/griffin/griffin.c
@@ -845,6 +845,11 @@ MENU
 #include "../menu/drivers/materialui.c"
 #endif
 
+#ifdef HAVE_WIMP
+#include "../deps/zahnrad/zahnrad.c"
+#include "../menu/drivers/wimp.c"
+#endif
+
 #ifdef HAVE_ZARCH
 #include "../menu/drivers/zarch.c"
 #endif
diff --git a/menu/menu_driver.c b/menu/menu_driver.c
index 7e5aa87616..2660beb1de 100644
--- a/menu/menu_driver.c
+++ b/menu/menu_driver.c
@@ -45,6 +45,9 @@ static const menu_ctx_driver_t *menu_ctx_drivers[] = {
 #if defined(HAVE_MATERIALUI)
    &menu_ctx_mui,
 #endif
+#if defined(HAVE_WIMP)
+   &menu_ctx_wimp,
+#endif
 #if defined(HAVE_XMB)
    &menu_ctx_xmb,
 #endif
diff --git a/menu/menu_driver.h b/menu/menu_driver.h
index 87c35c5759..4288defe3d 100644
--- a/menu/menu_driver.h
+++ b/menu/menu_driver.h
@@ -447,6 +447,7 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data);
 extern menu_ctx_driver_t menu_ctx_xui;
 extern menu_ctx_driver_t menu_ctx_rgui;
 extern menu_ctx_driver_t menu_ctx_mui;
+extern menu_ctx_driver_t menu_ctx_wimp;
 extern menu_ctx_driver_t menu_ctx_xmb;
 extern menu_ctx_driver_t menu_ctx_zarch;
 extern menu_ctx_driver_t menu_ctx_null;