diff --git a/lib/library.c b/lib/library.c
index 02c2af8..82c027b 100644
--- a/lib/library.c
+++ b/lib/library.c
@@ -122,7 +122,7 @@ bm_init(void)
     if (renderers.count > 0)
         return true;
 
-    static const char *rpath = INSTALL_PREFIX "/lib/bemenu";
+    static const char *rpath = INSTALL_LIBDIR "/bemenu";
     const char *path = secure_getenv("BEMENU_RENDERER");
 
     if (path)
diff --git a/lib/renderers/x11/CMakeLists.txt b/lib/renderers/x11/CMakeLists.txt
index e669050..7081e25 100644
--- a/lib/renderers/x11/CMakeLists.txt
+++ b/lib/renderers/x11/CMakeLists.txt
@@ -1,7 +1,7 @@
 FIND_PACKAGE(X11)
 FIND_PACKAGE(Cairo)
 
-if (X11_FOUND AND CAIRO_FOUND AND PANGO_FOUND)
+if (X11_FOUND AND X11_Xinerama_FOUND AND CAIRO_FOUND AND PANGO_FOUND)
     INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR} ${X11_INCLUDE_DIR} ${X11_Xinerama_INCLUDE_PATH} ${CAIRO_INCLUDE_DIRS} ${PANGO_INCLUDE_DIRS})
     ADD_LIBRARY(bemenu-renderer-x11 SHARED x11.c window.c xkb_unicode.c)
     SET_TARGET_PROPERTIES(bemenu-renderer-x11 PROPERTIES PREFIX "")
diff --git a/lib/version.h.in b/lib/version.h.in
index a6b287c..30d3ee2 100644
--- a/lib/version.h.in
+++ b/lib/version.h.in
@@ -1,4 +1,5 @@
 #define INSTALL_PREFIX "@CMAKE_INSTALL_PREFIX@"
+#define INSTALL_LIBDIR "@CMAKE_INSTALL_LIBDIR@"
 #define BM_VERSION "@BEMENU_VERSION@"
 #define BM_PLUGIN_VERSION "@BEMENU_VERSION@-@GIT_SHA1@"