diff --git a/scripts/crosstool-NG.sh.in b/scripts/crosstool-NG.sh.in
index f1e38fc9..d4e15fe3 100644
--- a/scripts/crosstool-NG.sh.in
+++ b/scripts/crosstool-NG.sh.in
@@ -168,8 +168,10 @@ if [ -n "${CT_RESTART}" -a ! -d "${CT_STATE_DIR}"  ]; then
 fi
 
 # If the local tarball directory does not exist, say so, and don't try to save there!
-if [ ! -d "${CT_LOCAL_TARBALLS_DIR}" ]; then
-    CT_DoLog WARN "Directory '${CT_LOCAL_TARBALLS_DIR}' does not exist. Will not save downloaded tarballs to local storage."
+if [    "${CT_SAVE_TARBALLS}" = "y"     \
+     -a ! -d "${CT_LOCAL_TARBALLS_DIR}" ]; then
+    CT_DoLog WARN "Directory '${CT_LOCAL_TARBALLS_DIR}' does not exist."
+    CT_DoLog WARN "Will not save downloaded tarballs to local storage."
     CT_SAVE_TARBALLS=
 fi