diff --git a/.drone.yml b/.drone.yml
index 434ba80..d78263f 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -193,7 +193,7 @@ steps:
   - apt-get install -qy -t sid libcurlpp-dev
   - apt-get install -qy build-essential file
   - rm -rf build && mkdir -p build && cd build
-  - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_MOZILLA=YES -DWITH_DEB=YES ..
+  - cmake -DCMAKE_INSTALL_PREFIX=/usr -DWITH_MOZILLA=YES -DMOZILLA_NMH_DIR="lib/mozilla/native-messaging-hosts" -DWITH_DEB=YES ..
   - make package
   - cp -v remwharead_${DRONE_TAG}-0_amd64.deb ..
   volumes:
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 20bb99e..b4eca79 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,6 +1,6 @@
 cmake_minimum_required (VERSION 3.2)
 project(remwharead
-  VERSION 0.2.4
+  VERSION 0.2.5
   LANGUAGES CXX
 )
 
diff --git a/README.adoc b/README.adoc
index 6e15814..ba398db 100644
--- a/README.adoc
+++ b/README.adoc
@@ -96,7 +96,9 @@ cmake --build .
 * `-DCMAKE_BUILD_TYPE=Debug` for a debug build.
 * `-DWITH_MAN=NO` to not compile the manpage.
 * `-DWITH_TESTS=YES` to compile the tests.
-* `-DWITH_MOZILLA=YES` to install the helper script for the Mozilla extension.
+* `-DWITH_MOZILLA=YES` to install the wrapper for the Mozilla extension.
+* `-DMOZILLA_NMH_DIR` lets you set the directory for the Mazilla
+  extension. Complete path is `${CMAKE_INSTALL_PREFIX}/${MOZILLA_NMH_DIR}`.
 * One of:
 ** `-DWITH_DEB=YES` if you want to be able to generate a deb-package.
 ** `-DWITH_RPM=YES` if you want to be able to generate an rpm-package.
diff --git a/browser-plugins/webextension/native-wrapper/CMakeLists.txt b/browser-plugins/webextension/native-wrapper/CMakeLists.txt
index 3638188..df05c11 100644
--- a/browser-plugins/webextension/native-wrapper/CMakeLists.txt
+++ b/browser-plugins/webextension/native-wrapper/CMakeLists.txt
@@ -1,5 +1,5 @@
 set(MOZILLA_NMH_DIR
-  "${CMAKE_INSTALL_LIBDIR}/mozilla/native-messaging-hosts")
+  "${CMAKE_INSTALL_LIBDIR}/mozilla/native-messaging-hosts" CACHE STRING "")
 set(INSTALL_MOZILLA_NMH_DIR
   "${CMAKE_INSTALL_PREFIX}/${MOZILLA_NMH_DIR}")
 
@@ -7,15 +7,15 @@ add_executable(${PROJECT_NAME}_wrapper ${PROJECT_NAME}_wrapper.cpp)
 install(TARGETS ${PROJECT_NAME}_wrapper DESTINATION ${MOZILLA_NMH_DIR})
 
 add_custom_command(
-  OUTPUT "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.json"
+  OUTPUT "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.json"
   WORKING_DIRECTORY
   "${CMAKE_SOURCE_DIR}/browser-plugins/webextension/native-wrapper"
   DEPENDS "${PROJECT_NAME}.json"
   COMMAND "./replace_nmh_dir.sh"
   ARGS "${INSTALL_MOZILLA_NMH_DIR}"
-  "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.json")
+  "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.json")
 add_custom_target(nmh_replace ALL
-  DEPENDS "${PROJECT_BINARY_DIR}/${PROJECT_NAME}.json")
+  DEPENDS "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.json")
 install(
-  FILES ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.json
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.json
   DESTINATION ${MOZILLA_NMH_DIR})