--- mysql-5.5.8/cmake/install_layout.cmake.layout	2010-12-03 18:58:26.000000000 +0100
+++ mysql-5.5.8/cmake/install_layout.cmake	2010-12-22 18:57:31.823379680 +0100
@@ -127,14 +127,15 @@
 # RPM layout
 #
 SET(INSTALL_BINDIR_RPM                  "bin")
-SET(INSTALL_SBINDIR_RPM                 "sbin")
+# SBIN only used for mysqld
+SET(INSTALL_SBINDIR_RPM                 "libexec")
 SET(INSTALL_SCRIPTDIR_RPM               "bin")
 #
 IF(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64")
-  SET(INSTALL_LIBDIR_RPM                "lib64")
+  SET(INSTALL_LIBDIR_RPM                "lib64/mysql")
   SET(INSTALL_PLUGINDIR_RPM             "lib64/mysql/plugin")
 ELSE()
-  SET(INSTALL_LIBDIR_RPM                "lib")
+  SET(INSTALL_LIBDIR_RPM                "lib/mysql")
   SET(INSTALL_PLUGINDIR_RPM             "lib/mysql/plugin")
 ENDIF()
 #
@@ -148,7 +149,7 @@
 SET(INSTALL_SHAREDIR_RPM                "share")
 SET(INSTALL_MYSQLSHAREDIR_RPM           "share/mysql")
 SET(INSTALL_MYSQLTESTDIR_RPM            "share/mysql-test")
-SET(INSTALL_SQLBENCHDIR_RPM             "")
+SET(INSTALL_SQLBENCHDIR_RPM             "share")
 SET(INSTALL_SUPPORTFILESDIR_RPM         "share/mysql")
 #
 SET(INSTALL_MYSQLDATADIR_RPM            "/var/lib/mysql")