diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8b0c4898785..2599a025e27 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -131,6 +131,10 @@ IF (NOT CPACK_GENERATOR)
   ENDIF(WIN32) 
 ENDIF(NOT CPACK_GENERATOR)
 
+IF(DEB)
+  SET(INSTALL_LAYOUT "DEB")
+ENDIF(DEB)
+
 INCLUDE(mysql_version)
 INCLUDE(cpack_rpm)
 INCLUDE(cpack_source_ignore_files)
diff --git a/cmake/build_configurations/mysql_release.cmake b/cmake/build_configurations/mysql_release.cmake
index 87fe47cac12..5b2596491ad 100644
--- a/cmake/build_configurations/mysql_release.cmake
+++ b/cmake/build_configurations/mysql_release.cmake
@@ -94,8 +94,19 @@ IF(FEATURE_SET)
 ENDIF()
 
 OPTION(ENABLED_LOCAL_INFILE "" ON)
-SET(WITH_SSL bundled CACHE STRING "")
-SET(WITH_ZLIB bundled CACHE STRING "")
+IF(RPM)
+  SET(WITH_SSL system CACHE STRING "")
+  SET(WITH_ZLIB system CACHE STRING "")
+ELSEIF(DEB)
+  SET(WITH_SSL system CACHE STRING "")
+  SET(WITH_ZLIB system CACHE STRING "")
+  SET(WITH_LIBWRAP ON)
+  SET(WITH_MAX ON)
+  SET(HAVE_EMBEDDED_PRIVILEGE_CONTROL ON)
+ELSE()
+  SET(WITH_SSL bundled CACHE STRING "")
+  SET(WITH_ZLIB bundled CACHE STRING "")
+ENDIF()
 
 IF(NOT COMPILATION_COMMENT)
   SET(COMPILATION_COMMENT "MariaDB Server")
diff --git a/debian/dist/Debian/rules b/debian/dist/Debian/rules
index 5cb22ae60d6..96ad527542d 100755
--- a/debian/dist/Debian/rules
+++ b/debian/dist/Debian/rules
@@ -70,30 +70,11 @@ endif
 			CXX=$${MYSQL_BUILD_CXX:-g++} \
 			CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
 		cmake .. \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-			-DINSTALL_SBINDIR=sbin  \
-			-DMYSQL_DATADIR=/var/lib/mysql \
-			-DINSTALL_INCLUDEDIR=include/mysql \
-			-DINSTALL_INFODIR=share/info \
-			-DINSTALL_MANDIR=share/man \
-		\
 		-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
+		-DBUILD_CONFIG=mysql_release \
 		-DCOMPILATION_COMMENT="mariadb.org binary distribution" \
 		-DSYSTEM_TYPE="debian-linux-gnu" \
-		-DINSTALL_LAYOUT=DEB \
-		\
-		-DENABLED_LOCAL_INFILE=1 \
-		-DWITH_FAST_MUTEXES=1 \
-		\
-		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-		\
-		-DEXTRA_CHARSETS=all \
-		-DWITH_LIBWRAP=1 \
-		-DWITH_SSL=system \
-		-DWITH_ZLIB=system \
-		-DWITH_EMBEDDED_SERVER=1  \
-	        -DHAVE_EMBEDDED_PRIVILEGE_CONTROL=ON \
-		-DWITH_MAX=1'
+		-DDEB=debian'
 
 	touch $@
 
diff --git a/debian/dist/Ubuntu/rules b/debian/dist/Ubuntu/rules
index 592b2e4d7d1..bb413ad83cc 100755
--- a/debian/dist/Ubuntu/rules
+++ b/debian/dist/Ubuntu/rules
@@ -70,30 +70,11 @@ endif
 			CXX=$${MYSQL_BUILD_CXX:-g++} \
 			CXXFLAGS=$${MYSQL_BUILD_CXXFLAGS:-"-O2 -fno-omit-frame-pointer -g -pipe -Wall -Wno-uninitialized"} \
 		cmake .. \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-			-DINSTALL_SBINDIR=sbin  \
-			-DMYSQL_DATADIR=/var/lib/mysql \
-			-DINSTALL_INCLUDEDIR=include/mysql \
-			-DINSTALL_INFODIR=share/info \
-			-DINSTALL_MANDIR=share/man \
-		\
 		-DMYSQL_SERVER_SUFFIX="-$(DEBVERSION)" \
+		-DBUILD_CONFIG=mysql_release \
 		-DCOMPILATION_COMMENT="mariadb.org binary distribution" \
 		-DSYSTEM_TYPE="debian-linux-gnu" \
-		-DINSTALL_LAYOUT=DEB \
-		\
-		-DENABLED_LOCAL_INFILE=1 \
-		-DWITH_FAST_MUTEXES=1 \
-		\
-		-DMYSQL_UNIX_ADDR=/var/run/mysqld/mysqld.sock \
-		\
-		-DEXTRA_CHARSETS=all \
-		-DWITH_LIBWRAP=1 \
-		-DWITH_SSL=system \
-		-DWITH_ZLIB=system \
-		-DWITH_EMBEDDED_SERVER=1  \
-	        -DHAVE_EMBEDDED_PRIVILEGE_CONTROL=ON \
-		-DWITH_MAX=1'
+		-DDEB=ubuntu'
 
 	touch $@