diff --git a/cmakeconfig.h.in b/cmakeconfig.h.in
index 77adf31a55..5adaab7121 100644
--- a/cmakeconfig.h.in
+++ b/cmakeconfig.h.in
@@ -19,10 +19,6 @@
 #define VERSION_RELEASE "${PROJECT_RELEASE_VERSION}"
 #define VERSION_FLAVOR "${VERSION_FLAVOR}"
 
-/* FIXME: Move the path stuff to the CMakeInstallDirs.cmake file */
-/* Directory for data */
-#define DATAFILE_DIR "${CMAKE_INSTALL_PREFIX}/${CMAKE_INSTALL_DATADIR}/${CPACK_PACKAGE_NAME}"
-
 /* Build wsutil with SIMD optimization */
 #cmakedefine HAVE_SSE4_2 1
 
diff --git a/wsutil/CMakeLists.txt b/wsutil/CMakeLists.txt
index 971900938f..dc40980efe 100644
--- a/wsutil/CMakeLists.txt
+++ b/wsutil/CMakeLists.txt
@@ -11,6 +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}\")
 
 set(WSUTIL_PUBLIC_HEADERS
 	adler32.h