diff --git a/chinese/bug5/Makefile b/chinese/bug5/Makefile
index 874f85a03eba..b1031d520ebc 100644
--- a/chinese/bug5/Makefile
+++ b/chinese/bug5/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	bug5
 PORTVERSION=	1.13
 CATEGORIES=	chinese converters
-DISTNAME=	buganini-${PORTNAME}-${PORTVERSION}-0-g${GH_COMMIT}
+DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	A Big5/GBK <-> UTF-8 translating layer in terminal
diff --git a/converters/bsdconv/Makefile b/converters/bsdconv/Makefile
index d1a1551405cb..ac2022bdd9e2 100644
--- a/converters/bsdconv/Makefile
+++ b/converters/bsdconv/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	bsdconv
 PORTVERSION=	9.0
 CATEGORIES=	converters
-DISTNAME=	buganini-${PORTNAME}-${PORTVERSION}-0-g${GH_COMMIT}
+DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	BSD licensed charset/encoding converter library
diff --git a/converters/gbsdconv/Makefile b/converters/gbsdconv/Makefile
index 519995b73add..492219c6d453 100644
--- a/converters/gbsdconv/Makefile
+++ b/converters/gbsdconv/Makefile
@@ -4,7 +4,7 @@
 PORTNAME=	gbsdconv
 PORTVERSION=	1.0
 CATEGORIES=	converters python
-DISTNAME=	buganini-${PORTNAME}-${PORTVERSION}-0-g${GH_COMMIT}
+DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	GUI for bsdconv
diff --git a/converters/p5-bsdconv/Makefile b/converters/p5-bsdconv/Makefile
index 0b891b6fc7be..2707eeee5dda 100644
--- a/converters/p5-bsdconv/Makefile
+++ b/converters/p5-bsdconv/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	bsdconv
 PORTVERSION=	9.0
 CATEGORIES=	converters perl5
 PKGNAMEPREFIX=	p5-
-DISTNAME=	buganini-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
+DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Perl wrapper for bsdconv
diff --git a/converters/php5-bsdconv/Makefile b/converters/php5-bsdconv/Makefile
index 582e83680ba4..1a6587faa741 100644
--- a/converters/php5-bsdconv/Makefile
+++ b/converters/php5-bsdconv/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	bsdconv
 PORTVERSION=	9.0
 CATEGORIES=	converters
 PKGNAMEPREFIX=	php5-
-DISTNAME=	buganini-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
+DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	PHP wrapper for bsdconv
diff --git a/converters/py-bsdconv/Makefile b/converters/py-bsdconv/Makefile
index b5bcddf2d573..118cc3aef974 100644
--- a/converters/py-bsdconv/Makefile
+++ b/converters/py-bsdconv/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	bsdconv
 PORTVERSION=	9.0
 CATEGORIES=	converters python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTNAME=	buganini-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
+DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Python wrapper for bsdconv
diff --git a/converters/ruby-bsdconv/Makefile b/converters/ruby-bsdconv/Makefile
index 81ef791ebfa0..d4f9e5a72456 100644
--- a/converters/ruby-bsdconv/Makefile
+++ b/converters/ruby-bsdconv/Makefile
@@ -5,7 +5,7 @@ PORTNAME=	bsdconv
 PORTVERSION=	9.0
 CATEGORIES=	converters ruby
 PKGNAMEPREFIX=	${RUBY_PKGNAMEPREFIX}
-DISTNAME=	buganini-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
+DISTNAME=	${GH_ACCOUNT}-${GH_PROJECT}-${PORTVERSION}-0-g${GH_COMMIT}
 
 MAINTAINER=	buganini@gmail.com
 COMMENT=	Ruby wrapper for bsdconv