diff --git a/CMakeLists.txt b/CMakeLists.txt
index 56975f82b32..943d4b4f0c2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -379,6 +379,7 @@ IF(WIN32)
 ELSE()
   SET(DEFAULT_MYSQL_HOME ${CMAKE_INSTALL_PREFIX})
   SET(SHAREDIR ${INSTALL_MYSQLSHAREDIRABS})
+  SET(HOSTNAME "uname -n" CACHE STRING "Command for determining hostname")
 ENDIF()
 
 SET(DEFAULT_BASEDIR "${DEFAULT_MYSQL_HOME}")
diff --git a/scripts/CMakeLists.txt b/scripts/CMakeLists.txt
index 9e50ae833b1..5c463e52107 100644
--- a/scripts/CMakeLists.txt
+++ b/scripts/CMakeLists.txt
@@ -177,7 +177,6 @@ ELSE()
   SET(CHECK_PID "kill -s SIGCONT $PID  > /dev/null 2> /dev/null")
 ENDIF()
 
-SET(HOSTNAME "uname -n")
 SET(MYSQLD_USER "mysql")
 SET(MYSQLD_GROUP "mysql")
 ENDIF(UNIX)
diff --git a/support-files/CMakeLists.txt b/support-files/CMakeLists.txt
index ee1d420e126..a44ed21bdbe 100644
--- a/support-files/CMakeLists.txt
+++ b/support-files/CMakeLists.txt
@@ -31,7 +31,6 @@ ELSE()
   SET(MYSQLD_USER "mysql")
   SET(MYSQLD_GROUP "mysql")
   SET(ini_file_extension "cnf")
-  SET(HOSTNAME "uname -n")
 
   # Define directly here, as cmake/install_layout.cmake has no LOGDIR to be inherited
   SET(su_user "su mysql mysql")