diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8eb6aa9725..7190b4256e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -189,6 +189,12 @@ if(WIN32)
 	set(CMAKE_INSTALL_LIBDIR ".")
 	set(CMAKE_INSTALL_INCLUDEDIR "include")
 	set(CMAKE_INSTALL_DATADIR ".")
+else()
+	# By default INSTALL_DATADIR is set to INSTALL_DATAROOTDIR, set the
+	# proper value here.
+	set(CMAKE_INSTALL_DATADIR "share/${CPACK_PACKAGE_NAME}"
+		CACHE PATH "Read-only architecture-independent data"
+	)
 endif()
 include(GNUInstallDirs)
 
@@ -2772,11 +2778,6 @@ set_source_files_properties(
 	COMPILE_FLAGS "${WERROR_COMMON_FLAGS}"
 )
 
-if(WIN32)
-	set(INSTALL_FILES_DATADIR ".")
-else()
-	set(INSTALL_FILES_DATADIR "${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}")
-endif()
 install(
 	FILES
 		${INSTALL_FILES}
@@ -2785,7 +2786,7 @@ install(
 		GROUP_READ
 		WORLD_READ
 	DESTINATION
-		${INSTALL_FILES_DATADIR}
+		${CMAKE_INSTALL_DATADIR}
 )
 
 set(SHARK_PUBLIC_HEADERS
@@ -2808,26 +2809,26 @@ install(FILES ${SHARK_PUBLIC_HEADERS}
 # Install icons and other desktop files for Freedesktop.org-compliant desktops.
 if((BUILD_wireshark AND QT_FOUND) AND NOT (WIN32 OR APPLE))
 	install(FILES wireshark-mime-package.xml
-		DESTINATION "${CMAKE_INSTALL_DATADIR}/mime/packages"
+		DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/mime/packages"
 		RENAME wireshark.xml
 	)
 	install(FILES wireshark.appdata.xml
-		DESTINATION "${CMAKE_INSTALL_DATADIR}/appdata"
+		DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/appdata"
 	)
 	if(BUILD_wireshark AND QT_FOUND)
 		install(FILES wireshark.desktop
-			DESTINATION "${CMAKE_INSTALL_DATADIR}/applications")
+			DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications")
 	endif()
 	foreach(size 16 24 32 48 64 128 256)
 		install(FILES image/wsicon${size}.png
-			DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}x${size}/apps"
+			DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/apps"
 			RENAME wireshark.png)
 		install(FILES image/WiresharkDoc-${size}.png
-			DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/${size}x${size}/mimetypes"
+			DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/${size}x${size}/mimetypes"
 			RENAME application-wireshark-doc.png)
 	endforeach()
 	install(FILES image/wsicon.svg
-		DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps"
+		DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/apps"
 		RENAME wireshark.svg)
 endif()
 
@@ -2842,7 +2843,7 @@ install(
 	DIRECTORY
 		${INSTALL_DIRS}
 	DESTINATION
-		${INSTALL_FILES_DATADIR}
+		${CMAKE_INSTALL_DATADIR}
 	FILE_PERMISSIONS
 		OWNER_WRITE OWNER_READ
 		GROUP_READ
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index b21f746023..f5f9435383 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -229,7 +229,7 @@ install(
 	FILES
 		${HTML_INSTALL_FILES}
 	DESTINATION
-		${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}
+		${CMAKE_INSTALL_DATADIR}
 )
 
 #
diff --git a/epan/wslua/CMakeLists.txt b/epan/wslua/CMakeLists.txt
index cb0495489a..56d751d07d 100644
--- a/epan/wslua/CMakeLists.txt
+++ b/epan/wslua/CMakeLists.txt
@@ -132,19 +132,13 @@ add_custom_target(
 
 set_target_properties(wsluaauxiliary PROPERTIES FOLDER "Auxiliary")
 
-if(WIN32)
-	set(WIRESHARK_INSTALL_LUADIR "${CMAKE_INSTALL_DATADIR}")
-else()
-	set(WIRESHARK_INSTALL_LUADIR "${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}")
-endif()
-
 install(
 	FILES
 		console.lua
 		dtd_gen.lua
 		${CMAKE_CURRENT_BINARY_DIR}/init.lua
 	DESTINATION
-		${WIRESHARK_INSTALL_LUADIR}
+		${CMAKE_INSTALL_DATADIR}
 )
 
 add_library(wslua OBJECT
diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
index ddf1f068d2..764feeea02 100644
--- a/help/CMakeLists.txt
+++ b/help/CMakeLists.txt
@@ -59,13 +59,7 @@ foreach(_help_file ${HELP_FILES})
 	list(APPEND copy_help_files_depends "${_dst_file}")
 endforeach()
 
-if(WIN32)
-	set(HELP_FILES_DATADIR "help")
-else()
-	set(HELP_FILES_DATADIR "${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}/help")
-endif()
-
 add_custom_target(copy_help_files ALL DEPENDS ${copy_help_files_depends} )
 set_target_properties(copy_help_files PROPERTIES FOLDER "Copy Tasks")
 
-install(FILES ${HELP_FILES} DESTINATION ${HELP_FILES_DATADIR})
+install(FILES ${HELP_FILES} DESTINATION "${CMAKE_INSTALL_DATADIR}/help")
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 25f32523a3..6335b57cbd 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -11,7 +11,7 @@ include(UseABICheck)
 
 add_definitions(-DPLUGIN_DIR=\"${CMAKE_INSTALL_PREFIX}/${PLUGIN_INSTALL_LIBDIR}\")
 add_definitions(-DEXTCAP_DIR=\"${CMAKE_INSTALL_PREFIX}/${EXTCAP_INSTALL_LIBDIR}\")
-add_definitions(-DDATAFILE_DIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}\")
+add_definitions(-DDATAFILE_DIR=\"${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}\")
 
 set(WSUTIL_PUBLIC_HEADERS
 	adler32.h