diff --git a/Installation/Jenkins/build.sh b/Installation/Jenkins/build.sh
index a46af24870..19b2925eab 100755
--- a/Installation/Jenkins/build.sh
+++ b/Installation/Jenkins/build.sh
@@ -268,6 +268,12 @@ while [ $# -gt 0 ];  do
             shift
             ;;
 
+        --clientBuildDir)
+            shift
+            CONFIGURE_OPTIONS="${CONFIGURE_OPTIONS} -DCLIENT_BUILD_DIR=$1"
+            shift
+            ;;
+
         --cswgcc)
 	    export CC="/opt/csw/bin/gcc"
 	    export CXX="/opt/csw/bin/g++"
diff --git a/cmake/packages/nsis.cmake b/cmake/packages/nsis.cmake
index 2e2c34489d..f1ccc02412 100644
--- a/cmake/packages/nsis.cmake
+++ b/cmake/packages/nsis.cmake
@@ -82,7 +82,11 @@ list(APPEND PACKAGES_LIST package-arongodb-server-zip)
 ################################################################################
 # hook to build the client package
 ################################################################################
-set(CLIENT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../p)
+string(LENGTH "${CLIENT_BUILD_DIR}" CLIENT_BUILD_DIR_LEN)
+if (${CLIENT_BUILD_DIR_LEN} EQUAL 0)
+  set(CLIENT_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/../p)
+endif()
+
 configure_file(cmake/packages/client/nsis.txt ${CLIENT_BUILD_DIR}/CMakeLists.txt @ONLY)
 add_custom_target(package-arongodb-client-nsis
   COMMAND ${CMAKE_COMMAND} .