diff --git a/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch b/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch
index 57d7f83b4..91dc9e7e1 100644
--- a/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch
+++ b/admin/linux/debian/debian.xenial/post-patches/qt5.5.patch
@@ -19,6 +19,6 @@ diff -ruN nextcloud-client-2.4.0.orig/src/CMakeLists.txt nextcloud-client-2.4.0/
  
 -find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
 +find_package(Qt5 5.5 COMPONENTS Core REQUIRED)
- configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
- configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
+ configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+ configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
  configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
diff --git a/admin/osx/CMakeLists.txt b/admin/osx/CMakeLists.txt
index 75e0abfc2..83b572a9e 100644
--- a/admin/osx/CMakeLists.txt
+++ b/admin/osx/CMakeLists.txt
@@ -12,7 +12,7 @@ else()
 endif()
 
 find_package(Qt5 5.6 COMPONENTS Core REQUIRED)
-configure_file(create_mac_pkg.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
-configure_file(macosx.pkgproj ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
+configure_file(create_mac.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/create_mac.sh)
+configure_file(macosx.pkgproj.cmake ${CMAKE_CURRENT_BINARY_DIR}/macosx.pkgproj)
 configure_file(pre_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/pre_install.sh)
 configure_file(post_install.sh.cmake ${CMAKE_CURRENT_BINARY_DIR}/post_install.sh)
diff --git a/admin/osx/create_mac_pkg.sh.cmake b/admin/osx/create_mac.sh.cmake
similarity index 100%
rename from admin/osx/create_mac_pkg.sh.cmake
rename to admin/osx/create_mac.sh.cmake
diff --git a/admin/osx/macosx.pkgproj b/admin/osx/macosx.pkgproj.cmake
similarity index 99%
rename from admin/osx/macosx.pkgproj
rename to admin/osx/macosx.pkgproj.cmake
index 927ca92df..0552e1c32 100644
--- a/admin/osx/macosx.pkgproj
+++ b/admin/osx/macosx.pkgproj.cmake
@@ -579,7 +579,9 @@
 					</dict>
 				</dict>
 				<key>INSTALLATION TYPE</key>
-				<integer>0</integer>
+                                <integer>1</integer>
+                                <key>MODE</key>
+                                <integer>1</integer>
 			</dict>
 			<key>INSTALLATION_STEPS</key>
 			<array>
@@ -699,7 +701,7 @@
 			<key>BUILD_PATH</key>
 			<dict>
 				<key>PATH</key>
-				<string>../install/.</string>
+                                <string>@CMAKE_INSTALL_PREFIX@/.</string>
 				<key>PATH_TYPE</key>
 				<integer>3</integer>
 			</dict>