diff --git a/Makefile b/Makefile
index 86ab89e..b3f63bd 100644
--- a/Makefile
+++ b/Makefile
@@ -1,19 +1,19 @@
 DESTDIR      ?=
-PREFIX        = $(DESTDIR)/usr/local
+PREFIX        = $(DESTDIR)/usr
 INSTALL       = /usr/bin/install
 override INSTALL += -D
 MSGFMT        = /usr/bin/msgfmt
 SED           = /bin/sed
 LN            = /bin/ln
 bindir        = $(PREFIX)/bin
-libdir        = $(PREFIX)/lib
-sysconfdir    = $(PREFIX)/etc
+libdir        = $(PREFIX)/local/lib
+sysconfdir    = /etc
 datarootdir   = ${PREFIX}/share
 datadir       = ${datarootdir}

 override CXXFLAGS += --std=gnu++11 -g3

-all: libprimus_vk.so libnv_vulkan_wrapper.so
+all: libprimus_vk.so libnv_vulkan_wrapper.so primus_vk_diag

 libprimus_vk.so: primus_vk.cpp
    $(CXX) $(CPPFLAGS) $(CXXFLAGS) -I/usr/include/vulkan -shared -fPIC $^ -o $@ -Wl,-soname,libprimus_vk.so.1 -ldl -lpthread $(LDFLAGS)
@@ -33,7 +33,7 @@ primus_vk_diag: primus_vk_diag.o
    $(CXX) -g3 -o $@ $^ -lX11 -lvulkan -ldl $(LDFLAGS)

 clean:
-   rm -f libnv_vulkan_wrapper.so libprimus_vk.so
+   rm -f libnv_vulkan_wrapper.so libprimus_vk.so primus_vk_diag primus_vk_diag.so

 install: all
    $(INSTALL) "libnv_vulkan_wrapper.so" "$(libdir)/libnv_vulkan_wrapper.so.1"
@@ -41,5 +41,12 @@ install: all
    $(INSTALL) "libprimus_vk.so"  "$(libdir)/libprimus_vk.so.1"
    $(LN) -s "libprimus_vk.so.1" "$(libdir)/libprimus_vk.so"
    $(INSTALL) -m644 "primus_vk.json" -t "$(datadir)/vulkan/implicit_layer.d/"
-   $(INSTALL) -m644 "nv_vulkan_wrapper.json" -t "$(datadir)/vulkan/icd.d/"
+   $(INSTALL) -m644 "nv_vulkan_wrapper.json" -t "$(sysconfdir)/vulkan/icd.d/"
+   mv -f "$(sysconfdir)/vulkan/icd.d/nvidia_icd.json" "$(sysconfdir)/vulkan/icd.d/nvidia_icd.json.primus_vk.bak"
    $(INSTALL) -m755 "pvkrun.in.sh" "$(bindir)/pvkrun"
+   $(INSTALL) -m755 "primus_vk_diag" "$(bindir)/primus_vk_diag"
+
+uninstall:
+   rm -f "$(libdir)/libnv_vulkan_wrapper.so.1" "$(libdir)/libnv_vulkan_wrapper.so" "$(libdir)/libprimus_vk.so.1" "$(libdir)/libprimus_vk.so" "$(datadir)/vulkan/implicit_layer.d/primus_vk.json" "$(sysconfdir)/vulkan/icd.d/nv_vulkan_wrapper.json" "$(bindir)/pvkrun" "$(bindir)/primus_vk_diag"
+   mv -uf "$(sysconfdir)/vulkan/icd.d/nvidia_icd.json.primus_vk.bak" "$(sysconfdir)/vulkan/icd.d/nvidia_icd.json"
+   rm -f "$(sysconfdir)/vulkan/icd.d/nvidia_icd.json.primus_vk.bak"
diff --git a/nv_vulkan_wrapper.cpp b/nv_vulkan_wrapper.cpp
index b186aac..39473cd 100644
--- a/nv_vulkan_wrapper.cpp
+++ b/nv_vulkan_wrapper.cpp
@@ -8,7 +8,7 @@ extern "C" VKAPI_ATTR VkResult VKAPI_CALL vk_icdNegotiateLoaderICDInterfaceVersi


 #ifndef NV_DRIVER_PATH
-#define NV_DRIVER_PATH "/usr/lib/x86_64-linux-gnu/nvidia/current/libGL.so.1"
+#define NV_DRIVER_PATH "/usr/lib64/opengl/nvidia/lib/libGLX_nvidia.so.0"
 #endif

 class StaticInitialize {
diff --git a/primus_vk.cpp b/primus_vk.cpp
index ba5a69e..31254a3 100644
--- a/primus_vk.cpp
+++ b/primus_vk.cpp
@@ -1,6 +1,7 @@
 #include "vulkan.h"
 #include "vk_layer.h"
 #include "vk_layer_dispatch_table.h"
+#include "vk_layer_utils.h"

 #include <cassert>
 #include <cstring>
diff --git a/primus_vk.json b/primus_vk.json
index 7b0771c..6c0977e 100644
--- a/primus_vk.json
+++ b/primus_vk.json
@@ -3,7 +3,7 @@
   "layer" : {
     "name": "VK_LAYER_PRIMUS_PrimusVK",
     "type": "GLOBAL",
-    "library_path": "libprimus_vk.so",
+    "library_path": "/usr/local/lib/libprimus_vk.so",
     "api_version": "1.1.0",
     "implementation_version": "1",
     "description": "Primus-vk - https://github.com/felixdoerre/primus_vk",
diff --git a/pvkrun.in.sh b/pvkrun.in.sh
index 4767033..16b3a7f 100644
--- a/pvkrun.in.sh
+++ b/pvkrun.in.sh
@@ -1,2 +1,2 @@
 #!/bin/sh
-ENABLE_PRIMUS_LAYER=1 exec primusrun "$@"
+ENABLE_PRIMUS_LAYER=1 exec optirun "$@"