diff --git a/CMakeLists.txt b/CMakeLists.txt
index 148b915ce..b37d03670 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -370,8 +370,9 @@ endif()
 
 # NOTE: If you make changes here, ensure they are compatible with the
 #       situation in gwdirs.h.in.
-if (NOT CMAKE_INSTALL_PREFIX EQUAL "/usr")
+if (NOT PACKAGE)
   install(DIRECTORY DESTINATION var/cache/maxscale)
   install(DIRECTORY DESTINATION var/log/maxscale)
   install(DIRECTORY DESTINATION var/run/maxscale)
+  install(DIRECTORY DESTINATION var/lib/maxscale)
 endif()
diff --git a/cmake/package_tgz.cmake b/cmake/package_tgz.cmake
index f99417748..d96756502 100644
--- a/cmake/package_tgz.cmake
+++ b/cmake/package_tgz.cmake
@@ -12,6 +12,12 @@ set(CMAKE_INSTALL_RPATH "$ORIGIN/../lib" CACHE PATH "" FORCE)
 set(CMAKE_INSTALL_DATADIR /share CACHE PATH "" FORCE)
 set(CPACK_GENERATOR "TGZ")
 
+# Include the var directories in the tarball
+install(DIRECTORY DESTINATION var/cache/maxscale)
+install(DIRECTORY DESTINATION var/log/maxscale)
+install(DIRECTORY DESTINATION var/run/maxscale)
+install(DIRECTORY DESTINATION var/lib/maxscale)
+
 if(DISTRIB_SUFFIX)
   set(CPACK_PACKAGE_FILE_NAME "maxscale-${MAXSCALE_VERSION}.${DISTRIB_SUFFIX}")
 else()