diff --git a/infrastructure/fetch/fetch-all b/infrastructure/fetch/fetch-all
index 64c68c6a3ca..a1d53606a47 100755
--- a/infrastructure/fetch/fetch-all
+++ b/infrastructure/fetch/fetch-all
@@ -2,7 +2,7 @@
 
 # Sample script to use with fetch-makefile: fetch all distfiles
 
-# $OpenBSD: fetch-all,v 1.3 2000/12/19 15:10:37 espie Exp $
+# $OpenBSD: fetch-all,v 1.4 2003/08/28 16:19:00 sturm Exp $
 #
 # Copyright (c) 2000 Marc Espie.
 # 
@@ -27,6 +27,11 @@
 # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
 # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+if [ "${FETCH_MANUALLY}" = "Yes" ]
+then
+	exit 0
+fi
+
 file=`echo $1|sed -e "s,^${DIST_SUBDIR:-.}/,,"`
 dir=`dirname $1`
 check=`basename $1`
diff --git a/infrastructure/mk/bsd.port.mk b/infrastructure/mk/bsd.port.mk
index c6475dbdf2c..f630d23bad6 100644
--- a/infrastructure/mk/bsd.port.mk
+++ b/infrastructure/mk/bsd.port.mk
@@ -1,6 +1,6 @@
 #-*- mode: Makefile; tab-width: 4; -*-
 # ex:ts=4 sw=4 filetype=make:
-#	$OpenBSD: bsd.port.mk,v 1.585 2003/08/21 20:22:45 espie Exp $
+#	$OpenBSD: bsd.port.mk,v 1.586 2003/08/28 16:19:00 sturm Exp $
 #	$FreeBSD: bsd.port.mk,v 1.264 1996/12/25 02:27:44 imp Exp $
 #	$NetBSD: bsd.port.mk,v 1.62 1998/04/09 12:47:02 hubertf Exp $
 #
@@ -1946,6 +1946,9 @@ _fetch-makefile:
 	@select='${_EVERYTHING:M*${_F:S@^${DIST_SUBDIR}/@@}\:[0-9]}'; \
 	${_SITE_SELECTOR}; \
 	echo "\t SITES=\"$$sites\" \\"
+.    if ${FETCH_MANUALLY:L} != "no"
+	@echo '\t FETCH_MANUALLY="Yes" \\'
+.    endif
 .    if !defined(NO_CHECKSUM) && !empty(_CKSUMFILES:M${_F})
 	@checksum_file=${CHECKSUM_FILE}; \
 	if [ ! -f $$checksum_file ]; then \