diff --git a/ccache/.footprint b/ccache/.footprint
index c5a78b181..9bde00f3b 100644
--- a/ccache/.footprint
+++ b/ccache/.footprint
@@ -3,10 +3,11 @@ drwxr-xr-x	root/root	usr/bin/
 -rwxr-xr-x	root/root	usr/bin/ccache
 drwxr-xr-x	root/root	usr/lib/
 drwxr-xr-x	root/root	usr/lib/ccache/
-lrwxrwxrwx	root/root	usr/lib/ccache/c++ -> ../../bin/ccache
-lrwxrwxrwx	root/root	usr/lib/ccache/cc -> ../../bin/ccache
-lrwxrwxrwx	root/root	usr/lib/ccache/g++ -> ../../bin/ccache
-lrwxrwxrwx	root/root	usr/lib/ccache/gcc -> ../../bin/ccache
+lrwxrwxrwx	root/root	usr/lib/ccache/c++ -> /usr/bin/ccache
+lrwxrwxrwx	root/root	usr/lib/ccache/cc -> /usr/bin/ccache
+lrwxrwxrwx	root/root	usr/lib/ccache/cpp -> /usr/bin/ccache
+lrwxrwxrwx	root/root	usr/lib/ccache/g++ -> /usr/bin/ccache
+lrwxrwxrwx	root/root	usr/lib/ccache/gcc -> /usr/bin/ccache
 drwxr-xr-x	root/root	usr/man/
 drwxr-xr-x	root/root	usr/man/man1/
 -rw-r--r--	root/root	usr/man/man1/ccache.1.gz
diff --git a/ccache/.md5sum b/ccache/.md5sum
index 7d969752a..5387f13c1 100644
--- a/ccache/.md5sum
+++ b/ccache/.md5sum
@@ -1 +1 @@
-7922ad7b8b44377df78896de8f7b39d1  ccache-3.2.tar.xz
+d8a7c1d70dbed5dae66620227954ed90  ccache-3.2.1.tar.xz
diff --git a/ccache/Pkgfile b/ccache/Pkgfile
index 61df4e1d4..99b4563e1 100644
--- a/ccache/Pkgfile
+++ b/ccache/Pkgfile
@@ -1,10 +1,11 @@
-# Description: A compiler cache.
+# Description: A fast compiler cache.
 # URL: http://ccache.samba.org/
 # Maintainer: Danny Rawlins, crux at romster dot me
 # Packager: Tilman Sauerbeck, tilman at crux dot nu
+# Depends on: zlib
 
 name=ccache
-version=3.2
+version=3.2.1
 release=1
 source=(http://samba.org/ftp/$name/$name-$version.tar.xz)
 
@@ -19,9 +20,12 @@ build() {
 	make DESTDIR=$PKG install
 
 	install -d $PKG/usr/lib/$name
-	for c in cc c++ gcc g++; do
-		cd $PKG/usr/lib/$name && ln -s ../../bin/ccache $c
+
+	if [ "$(prt-get isinst clang)" = 'package clang is installed' ]; then
+			local clang='clang clang++'
+	fi
+
+	for c in $clang cc gcc g++ cpp c++; do
+		ln -s /usr/bin/ccache $PKG/usr/lib/ccache/$c
 	done
-   
-	rm -rf $PKG/usr/info
 }
diff --git a/ccache/README b/ccache/README
index 39a2e8919..104a17065 100644
--- a/ccache/README
+++ b/ccache/README
@@ -1,17 +1,25 @@
-WARNING:
-
-This version of the port is incompatible with the previous ones, so 
-please make sure you don't have any 
-  export CC=/usr/bin/ccache-gcc 
-or
-  export CXX=/usr/bin/ccache-g++
-in your startup/configuration files; this will make compilations fail.
-
-
 POSTINSTALL
-To use ccache, prepend /usr/lib/ccache to your $PATH environment variable.
 
-You might also want to change the ccache directory, using the CCACHE_DIR 
-environement variable, or by using symlinks (I have created a /ccache 
-directory, and make $HOME/.ccache point to /ccache for those users who
-want to use the shared cache)
+  There are two ways to use ccache. You can either prefix your compilation
+  commands with ccache or you can let ccache masquerade as the compiler by
+  prepending /usr/lib/ccache to your $PATH environment variable. The first
+  method is most convenient if you just want to try out ccache or wish to
+  use it for some specific projects. The second method is most useful for
+  when you wish to use ccache for all your compilations.
+
+  You can also set CC and CXX like so,
+  export CC='ccache gcc' ; export CXX='ccache g++' to /etc/pkgmk.conf
+  But this method can break on some packages not expecting a space in
+  CC or CXX.
+
+  You might also want to change the ccache directory, using the CCACHE_DIR
+  environement variable. (I personally use
+  export CCACHE_DIR="/var/cache/ccache").
+
+  You may also want to use distcc as a backend to ccache by setting
+  export CCACHE_PREFIX="distcc"
+
+  Also if you plan to use this same cache between different crux versions and
+  compiler versions, you can do something like this
+  export CCACHE_COMPILERCHECK="%compiler% -dumpversion; crux"
+  to prevent cache errors.