diff --git a/check_rc_upgrade.sh b/check_rc_upgrade.sh
index 90c460d..4c34725 100755
--- a/check_rc_upgrade.sh
+++ b/check_rc_upgrade.sh
@@ -10,10 +10,10 @@ MAX_CHECK=10
 MAX_FAILED=3
 SLEEP_ON_FAILED=10
 CHECK_URL=http://www.roundcube.net/download
+DOWNLOAD=0
 DOWNLOAD_DIR=$RC_HOME/../upstream
 
 DEBUG=0
-DOWNLOAD=0
 
 function usage() {
 	echo "Usage : $0 [-v] [-d]"
@@ -102,6 +102,20 @@ done
 
 if [ "$newest" != "$current" ]
 then
+
+	if [ $DOWNLOAD -eq 1 ]
+	then
+		if [ -d "$DOWNLOAD_DIR" ]
+		then
+			cd "$DOWNLOAD_DIR"
+			DOWNLOAD_FILE="$( pwd )/roundcubemail-$newest.tar.gz"
+			[ $DEBUG -eq 1 ] && echo "Download new release in $DOWNLOAD_FILE"
+			wget -q -O "$DOWNLOAD_FILE" "$DOWNLOAD_URL"
+		else
+			echo "[WARNING] Le dossier de telechargement n'existe pas ($DOWNLOAD_DIR)."
+		fi
+	fi
+
 	tmp=`mktemp`
 	echo "New RoundCude release" > $tmp
 	echo "=====================" >> $tmp
@@ -109,19 +123,8 @@ then
 	echo "Newest : $newest" >> $tmp
 	echo >> $tmp
 	echo "Download URL : $DOWNLOAD_URL" >> $tmp
+	[ -n "$DOWNLOAD_FILE" -a -f "$DOWNLOAD_FILE" ] && echo "Download file : $( pwd )/roundcubemail-$newest.tar.gz" >> $tmp
 
-	if [ $DOWNLOAD -eq 1 ]
-	then
-		if [ -d "$DOWNLOAD_DIR" ]
-		then
-			cd "$DOWNLOAD_DIR"
-			[ $DEBUG -eq 1 ] && echo "Download new release in $( pwd )/roundcubemail-$newest.tar.gz"
-			wget -q -O "roundcubemail-$newest.tar.gz" "$DOWNLOAD_URL"
-			echo "Download file : $( pwd )/roundcubemail-$newest.tar.gz" >> $tmp
-		else
-			echo "[WARNING] Le dossier de telechargement n'existe pas ($DOWNLOAD_DIR)."
-		fi
-	fi
 	
 	M=0
 	if [ -f $CACHE ]