diff --git a/build/build_main.sh b/build/build_main.sh
index 7bbc56a07e..d3f8537314 100755
--- a/build/build_main.sh
+++ b/build/build_main.sh
@@ -67,8 +67,9 @@ fi
 [ -z "$inc_scaffold" ]  && . "$basedir/build/scaffold.sh"
 
 case "$command" in
-  git_build_into)  if [ "${statusdir}/full_build" -nt "${statusdir}/../index.cgi" ]; then
+  git_build_into)  if [ -f "${statusdir}/full_build" ]; then
                      debug "discovered flag file, performing full build"
+                     rm "${statusdir}/full_build"
                      build_into
                    else
                      git_build_into
diff --git a/status.fsfe.org/fsfe.org/index.cgi b/status.fsfe.org/fsfe.org/index.cgi
index 7cd6c4447d..f3ed5a7ece 100755
--- a/status.fsfe.org/fsfe.org/index.cgi
+++ b/status.fsfe.org/fsfe.org/index.cgi
@@ -70,7 +70,7 @@ cat <<-HTML_END
 <dt>Duration:</dt><dd>$([ "$duration" -gt 0 ] && duration ${duration})</dd>
 <dt>Termination Status:</dt><dd>${term_status:-running...}</dd>
 </dl>
-$(if [ ./$DATADIR/full_build -nt ./index.cgi ]; then
+$(if [ -f ./$DATADIR/full_build ]; then
     printf '<span class="fullbuild">Full rebuild will be started within next minute.</span>'
 else
     printf '<a class="fullbuild" href="./?full_build">Schedule full rebuild</a>'