diff --git a/.gitignore b/.gitignore
index d98cc99..9452199 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/ccache-3.1.4.tar.xz
+/*.tar.xz
diff --git a/ccache.csh.in b/ccache.csh.in
index 4edbb51..0f58940 100644
--- a/ccache.csh.in
+++ b/ccache.csh.in
@@ -24,3 +24,5 @@ else if ( $uid != 0 ) then
         unsetenv CCACHE_HARDLINK
     endif
 endif
+
+setenv CCACHE_HASHDIR
diff --git a/ccache.sh.in b/ccache.sh.in
index 0ce4d64..29f8303 100644
--- a/ccache.sh.in
+++ b/ccache.sh.in
@@ -25,3 +25,5 @@ elif [ "${EUID:-}" != 0 ] ; then
         unset CCACHE_HARDLINK
     fi
 fi
+
+export CCACHE_HASHDIR=
diff --git a/ccache.spec b/ccache.spec
index c709900..4849d69 100644
--- a/ccache.spec
+++ b/ccache.spec
@@ -12,8 +12,8 @@
 %global relccache %(%abs2rel %{_bindir}/ccache %{_libdir}/ccache)
 
 Name:           ccache
-Version:        3.1.4
-Release:        4%{?dist}
+Version:        3.1.6
+Release:        1%{?dist}
 Summary:        C/C++ compiler cache
 
 Group:          Development/Tools
@@ -142,6 +142,15 @@ getent group ccache >/dev/null || groupadd -r ccache || :
 
 
 %changelog
+* Sun Dec  4 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.6-2
+- Turn on CCACHE_HASHDIR by default (#759592, Jan Kratochvil).
+
+* Mon Aug 22 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.6-1
+- Update to 3.1.6.
+
+* Mon May 30 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.5-1
+- Update to 3.1.5.
+
 * Sat Apr  2 2011 Ville Skyttä <ville.skytta@iki.fi> - 3.1.4-4
 - Replace Requires(trigger*) with plain requires to appease rpmbuild >= 4.9.
 
diff --git a/sources b/sources
index 98a74bb..1ac65ce 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c70a6e2e5da8d957d175343412e494b  ccache-3.1.4.tar.xz
+4adee18e0e7a767112913c56fdb06792  ccache-3.1.6.tar.xz