diff --git a/appstream-glib.changes b/appstream-glib.changes
index 892c32e..0abf2c0 100644
--- a/appstream-glib.changes
+++ b/appstream-glib.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Fri Jan 29 16:02:58 UTC 2016 - dimstar@opensuse.org
+
+- openSUSE-appstream-process: use specific temporary/cache
+  directories between calls. Otherwise, icons extracted from a
+  previous run bleed into the next one.
+
 -------------------------------------------------------------------
 Fri Jan 29 11:57:01 UTC 2016 - dimstar@opensuse.org
 
diff --git a/openSUSE-appstream-process b/openSUSE-appstream-process
index acde898..8da188c 100644
--- a/openSUSE-appstream-process
+++ b/openSUSE-appstream-process
@@ -7,17 +7,22 @@ URL=https://static.opensuse.org/appstream/tumbleweed
 # Users interested in them can always produce them locally out of the appdata.xml.gz file
 HTMLOUT=no
 
+TMDIR=$(mktemp -d)
+
 /usr/bin/appstream-builder \
   --enable-hidpi					\
   --include-failed					\
-  --temp-dir=/tmp/apb					\
-  --cache-dir=/tmp/apb/cache				\
+  --temp-dir=${TMPDIR}/apb				\
+  --cache-dir=${TMPDIR}/apb/cache			\
   --origin=appdata					\
   --api-version=0.8					\
   --basename=appdata					\
   --packages-dir=${SRC}					\
   --output-dir=${DEST}
 
+# clean up TMPDIR again
+rm -rf ${TMPDIR}
+
 # Change screenshot URLs to our own infrastructure; disabled, as infra not ready
 # appstream-util mirror-screenshots 	\
 #   ${DEST}/appdata.xml.gz 		\