diff --git a/mk/fetch/sites.mk b/mk/fetch/sites.mk
index e0697be9d314..dac3ace09a37 100644
--- a/mk/fetch/sites.mk
+++ b/mk/fetch/sites.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sites.mk,v 1.108 2014/12/04 18:42:40 rodent Exp $
+# $NetBSD: sites.mk,v 1.109 2015/01/17 05:51:43 obache Exp $
 #
 # This Makefile fragment defines read-only MASTER_SITE_* variables
 # representing some well-known master distribution sites for software.
@@ -383,6 +383,11 @@ MASTER_SITE_NETLIB+= \
 	http://www.netlib.no/netlib/ \
 	http://www.mirrorservice.org/sites/netlib.bell-labs.com/netlib/
 
+MASTER_SITE_OPENBSD+= \
+	ftp://ftp.OpenBSD.org/pub/OpenBSD/ \
+	ftp://ftp3.usa.openbsd.org/pub/OpenBSD/ \
+	ftp://ftp.jaist.ac.jp/pub/OpenBSD/
+
 MASTER_SITE_RUBYGEMS+= \
 	http://rubygems.org/downloads/ \
 
diff --git a/net/openntpd/Makefile b/net/openntpd/Makefile
index af72054b077d..dbfdbcff0982 100644
--- a/net/openntpd/Makefile
+++ b/net/openntpd/Makefile
@@ -1,11 +1,9 @@
-# $NetBSD: Makefile,v 1.35 2015/01/17 05:41:03 obache Exp $
+# $NetBSD: Makefile,v 1.36 2015/01/17 05:51:43 obache Exp $
 
 DISTNAME=		openntpd-3.9p1
 PKGREVISION=		5
 CATEGORIES=		net
-MASTER_SITES=		ftp://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/ \
-			ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenNTPD/ \
-			ftp://ftp.jaist.ac.jp/pub/OpenBSD/OpenNTPD/
+MASTER_SITES=		${MASTER_SITE_OPENBSD:=OpenNTPD/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.openntpd.org/
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 69fafb1481e4..94c3317c34bf 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,14 +1,10 @@
-# $NetBSD: Makefile,v 1.224 2015/01/17 05:31:52 obache Exp $
+# $NetBSD: Makefile,v 1.225 2015/01/17 05:51:43 obache Exp $
 
 DISTNAME=		openssh-6.6p1
 PKGNAME=		openssh-6.6.1
 PKGREVISION=		4
 CATEGORIES=		security
-MASTER_SITES=		ftp://ftp.openssh.com/pub/OpenBSD/OpenSSH/portable/ \
-			ftp://ftp3.usa.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
-			ftp://gd.tuwien.ac.at/opsys/OpenBSD/OpenSSH/portable/ \
-			ftp://ftp.freenet.de/pub/ftp.openbsd.org/pub/OpenBSD/OpenSSH/portable/ \
-			ftp://ftp.jaist.ac.jp/pub/OpenBSD/OpenSSH/portable/
+MASTER_SITES=		${MASTER_SITE_OPENBSD:=OpenSSH/portable/}
 
 MAINTAINER=		pkgsrc-users@NetBSD.org
 HOMEPAGE=		http://www.openssh.com/