diff --git a/usr.sbin/pkg/FreeBSD.conf b/usr.sbin/pkg/FreeBSD.conf.latest
similarity index 100%
copy from usr.sbin/pkg/FreeBSD.conf
copy to usr.sbin/pkg/FreeBSD.conf.latest
diff --git a/usr.sbin/pkg/FreeBSD.conf b/usr.sbin/pkg/FreeBSD.conf.quarterly
similarity index 87%
rename from usr.sbin/pkg/FreeBSD.conf
rename to usr.sbin/pkg/FreeBSD.conf.quarterly
index e4eec8f11451..68e1d32ac680 100644
--- a/usr.sbin/pkg/FreeBSD.conf
+++ b/usr.sbin/pkg/FreeBSD.conf.quarterly
@@ -1,16 +1,16 @@
 # $FreeBSD$
 #
 # To disable this repository, instead of modifying or removing this file,
 # create a /usr/local/etc/pkg/repos/FreeBSD.conf file:
 #
 #   mkdir -p /usr/local/etc/pkg/repos
 #   echo "FreeBSD: { enabled: no }" > /usr/local/etc/pkg/repos/FreeBSD.conf
 #
 
 FreeBSD: {
-  url: "pkg+http://pkg.FreeBSD.org/${ABI}/latest",
+  url: "pkg+http://pkg.FreeBSD.org/${ABI}/quarterly",
   mirror_type: "srv",
   signature_type: "fingerprints",
   fingerprints: "/usr/share/keys/pkg",
   enabled: yes
 }
diff --git a/usr.sbin/pkg/Makefile b/usr.sbin/pkg/Makefile
index 6ca341f0ad4e..2d5f9c9fbb82 100644
--- a/usr.sbin/pkg/Makefile
+++ b/usr.sbin/pkg/Makefile
@@ -1,14 +1,16 @@
 # $FreeBSD$
 
-CONFS=	FreeBSD.conf
+PKGCONFBRANCH?=	latest
+CONFS=		FreeBSD.conf.${PKGCONFBRANCH}
+CONFSNAME=	FreeBSD.conf
 CONFSDIR=	/etc/pkg
 CONFSMODE=	644
 PROG=	pkg
 SRCS=	pkg.c dns_utils.c config.c
 MAN=	pkg.7
 
 CFLAGS+=-I${SRCTOP}/contrib/libucl/include
 .PATH:	${SRCTOP}/contrib/libucl/include
 LIBADD=	archive fetch ucl sbuf crypto ssl
 
 .include <bsd.prog.mk>