diff --git a/tools/catalyst-auto-sparc64.conf b/tools/catalyst-auto-sparc64.conf
index c866c081..f93796f0 100644
--- a/tools/catalyst-auto-sparc64.conf
+++ b/tools/catalyst-auto-sparc64.conf
@@ -41,7 +41,21 @@ pre_build() {
 
 
 post_build() {
-  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* sparc@nightheron.gentoo.org:
-  rsync -e 'ssh -i /root/.ssh/id_rsa' ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* sparc@nightheron.gentoo.org:multilib
-
+  mkdir -p ${TMPDIR}/empty
+  cmd=(
+    rsync
+    -e 'ssh -i /root/.ssh/id_rsa'
+    -a
+    --omit-dir-times
+    --delay-updates
+  )
+  "${cmd[@]}" ${TMPDIR}/empty ${DEST}
+  "${cmd[@]}" ${TMPDIR}/empty ${DEST}/multilib
+  "${cmd[@]}" \
+    ${BUILD_SRCDIR_BASE}/builds/default/stage3-*${DATESTAMP}*.bz2* \
+    ${BUILD_SRCDIR_BASE}/builds/default/*${DATESTAMP}*.iso* \
+    sparc@nightheron.gentoo.org:
+  "${cmd[@]}" \
+    ${BUILD_SRCDIR_BASE}/builds/multilib/stage3-*${DATESTAMP}*.bz2* \
+    sparc@nightheron.gentoo.org:multilib
 }