diff --git a/debian/changelog b/debian/changelog
index 6c82e13eb..1fc9855b2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+keystone (2:10.0.0-5) unstable; urgency=medium
+
+  * Check if /var/log/keystone exists in cron job (Closes: #847692).
+
+ -- Thomas Goirand <zigo@debian.org>  Sun, 18 Dec 2016 11:52:15 +0100
+
 keystone (2:10.0.0-4) unstable; urgency=medium
 
   * Fix passlib call of encrypt() which is replaced by hash() upstream
diff --git a/debian/keystone.cron.hourly b/debian/keystone.cron.hourly
index b372e9d16..c4c8fcd03 100644
--- a/debian/keystone.cron.hourly
+++ b/debian/keystone.cron.hourly
@@ -10,7 +10,7 @@ if [ -x /usr/bin/keystone-manage ] ; then
 	else
 		PROVIDER=uuid
 	fi
-	if [ "${PROVIDER}" = "uuid" ] ; then
+	if [ "${PROVIDER}" = "uuid" ] && [ -d /var/log/keystone ] ; then
 		su -c '/usr/bin/keystone-manage token_flush >/var/log/keystone/keystone-tokenflush.log 2>&1' keystone
 	fi
 fi