diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in
index 31cdf0d5..0b83bc53 100644
--- a/scripts/makepkg.sh.in
+++ b/scripts/makepkg.sh.in
@@ -1334,10 +1334,9 @@ else
 	fi
 fi
 
-# get back to our src directory so we can begin with sources
+# ensure existence of our src directory so we can begin with sources
 mkdir -p "$srcdir"
 chmod a-s "$srcdir"
-cd_safe "$srcdir"
 
 if (( !REPKG )); then
 	if (( NOEXTRACT && ! VERIFYSOURCE )); then
@@ -1349,9 +1348,12 @@ if (( !REPKG )); then
 
 		if (( CLEANBUILD )); then
 			msg "$(gettext "Removing existing %s directory...")" "\$srcdir/"
-			rm -rf "$srcdir"/*
+			rm -rf "$srcdir"
+			mkdir -p "$srcdir"
+			chmod a-s "$srcdir"
 		fi
 
+		cd_safe "$srcdir"
 		extract_sources
 		if (( PREPAREFUNC )); then
 			run_prepare