diff --git a/include/host-build.mk b/include/host-build.mk
index a7b772658d8942d1f3a279bdf4207e22e2cbbbc3..79a9b1f8d605ca48e41001ad0177ca53c7e84fb9 100644
--- a/include/host-build.mk
+++ b/include/host-build.mk
@@ -132,9 +132,7 @@ define Host/Exports/Default
   $(1) : export STAGING_PREFIX=$$(HOST_BUILD_PREFIX)
   $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig:$$(HOST_BUILD_PREFIX)/lib/pkgconfig
   $(1) : export PKG_CONFIG_LIBDIR=$$(HOST_BUILD_PREFIX)/lib/pkgconfig
-# Do not set CCACHE_dir. We want to use the home directory of the user.
-# otherwise nigtly and new builds will not see a speedup.
-#  $(1) : export CCACHE_DIR:=$(STAGING_DIR_HOST)/ccache
+  $(if $(CONFIG_CCACHE),$(1) : export CCACHE_DIR:=$(STAGING_DIR_HOST)/ccache)
   $(if $(HOST_CONFIG_SITE),$(1) : export CONFIG_SITE:=$(HOST_CONFIG_SITE))
   $(if $(IS_PACKAGE_BUILD),$(1) : export PATH=$$(TARGET_PATH_PKG))
 endef
diff --git a/include/package.mk b/include/package.mk
index 4e99501727a645a0bf0b04e4f7942d3c79835143..c28f0aa2623f23726d27dda83aeba38cfa9db55c 100644
--- a/include/package.mk
+++ b/include/package.mk
@@ -174,9 +174,7 @@ define Build/Exports/Default
   $(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
   $(1) : export PKG_CONFIG_PATH:=$$(PKG_CONFIG_PATH)
   $(1) : export PKG_CONFIG_LIBDIR:=$$(PKG_CONFIG_PATH)
-# do not set CCACHE_dir. We want to use the homedirecoty of the user.
-# otherwise nigtly and new builds will not see a speedup.
-#  $(1) : export CCACHE_DIR:=$(STAGING_DIR)/ccache
+  $(if $(CONFIG_CCACHE),$(1) : export CCACHE_DIR:=$(STAGING_DIR)/ccache)
 endef
 Build/Exports=$(Build/Exports/Default)