diff --git a/ports-mgmt/pkg-devel/Makefile b/ports-mgmt/pkg-devel/Makefile
index dbe5ab870b95..49b512659715 100644
--- a/ports-mgmt/pkg-devel/Makefile
+++ b/ports-mgmt/pkg-devel/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.2.6
+DISTVERSION=	1.2.7
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
+		http://files.etoilebsd.net/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
-		http://miwibox.org/distfiles/${PORTNAME}/ \
-		http://files.etoilebsd.net/pkg/ \
 		LOCAL/portmgr
 PKGNAMESUFFIX=	-devel
 
@@ -15,13 +14,12 @@ COMMENT=	Package manager
 
 LICENSE=	BSD2CLAUSE
 
-USE_XZ=		yes
+USES=		tar:xz uidfix
 
 # Disable CCACHE support because of the chicken/egg problem pkg should always
 # With no dependency at all
 NO_CCACHE=	yes
 USE_LDCONFIG=	yes
-USES=		uidfix
 MAKE_ARGS+=	PKG_PORTSDIR=${PORTSDIR}
 
 MAKE_ENV+=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \
diff --git a/ports-mgmt/pkg-devel/distinfo b/ports-mgmt/pkg-devel/distinfo
index 95045718023d..aca1a06a3523 100644
--- a/ports-mgmt/pkg-devel/distinfo
+++ b/ports-mgmt/pkg-devel/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.2.6.tar.xz) = 6c16c233986b1ff5268284c356ce870134f07f84710d61ec7033a3d729bdbbb0
-SIZE (pkg-1.2.6.tar.xz) = 1808860
+SHA256 (pkg-1.2.7.tar.xz) = 450f51a4c6e3d05fac9b0e408e5dfe252ac87abe72481a5b4711f077178ba4c1
+SIZE (pkg-1.2.7.tar.xz) = 1822868
diff --git a/ports-mgmt/pkg/Makefile b/ports-mgmt/pkg/Makefile
index 80cd8c7fdebf..a7e76ab67e6a 100644
--- a/ports-mgmt/pkg/Makefile
+++ b/ports-mgmt/pkg/Makefile
@@ -1,12 +1,11 @@
 # $FreeBSD$
 
 PORTNAME=	pkg
-DISTVERSION=	1.2.6
+DISTVERSION=	1.2.7
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	\
-		http://miwibox.org/distfiles/${PORTNAME}/ \
+		http://files.etoilebsd.net/${PORTNAME}/ \
 		http://mirror.shatow.net/freebsd/${PORTNAME}/ \
-		http://files.etoilebsd.net/pkg/ \
 		LOCAL/portmgr
 
 MAINTAINER=	portmgr@FreeBSD.org
@@ -14,13 +13,12 @@ COMMENT=	Package manager
 
 LICENSE=	BSD2CLAUSE
 
-USE_XZ=		yes
+USES=		tar:xz uidfix
 
 # Disable CCACHE support because of the chicken/egg problem pkg should always
 # With no dependency at all
 NO_CCACHE=	yes
 USE_LDCONFIG=	yes
-USES=		uidfix
 MAKE_ARGS+=	PKG_PORTSDIR=${PORTSDIR}
 
 MAKE_ENV+=	WITHOUT_PROFILE=yes __MAKE_CONF=/dev/null SRCCONF=/dev/null \
diff --git a/ports-mgmt/pkg/distinfo b/ports-mgmt/pkg/distinfo
index 95045718023d..aca1a06a3523 100644
--- a/ports-mgmt/pkg/distinfo
+++ b/ports-mgmt/pkg/distinfo
@@ -1,2 +1,2 @@
-SHA256 (pkg-1.2.6.tar.xz) = 6c16c233986b1ff5268284c356ce870134f07f84710d61ec7033a3d729bdbbb0
-SIZE (pkg-1.2.6.tar.xz) = 1808860
+SHA256 (pkg-1.2.7.tar.xz) = 450f51a4c6e3d05fac9b0e408e5dfe252ac87abe72481a5b4711f077178ba4c1
+SIZE (pkg-1.2.7.tar.xz) = 1822868