diff --git a/x11-toolkits/blt/Makefile b/x11-toolkits/blt/Makefile
index 92ebb98d8c5c..7de4cb37428a 100644
--- a/x11-toolkits/blt/Makefile
+++ b/x11-toolkits/blt/Makefile
@@ -11,7 +11,7 @@ DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Extension to the Tk toolkit
 
-LICENSE=	BSD
+LICENSE=	MIT
 
 LIB_DEPENDS=	libjpeg.so:${PORTSDIR}/graphics/jpeg
 
diff --git a/x11-toolkits/gnocl/Makefile b/x11-toolkits/gnocl/Makefile
index 9cd7e8528fa9..243a0f2c23c3 100644
--- a/x11-toolkits/gnocl/Makefile
+++ b/x11-toolkits/gnocl/Makefile
@@ -9,8 +9,10 @@ MASTER_SITES=	SF/${PORTNAME}/Gnocl-Nightly-Build/
 MAINTAINER=	tcltk@FreeBSD.org
 COMMENT=	GTK+ and Gnome extension for Tcl
 
-LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/license.terms
+LICENSE=	TclTk
+LICENSE_NAME=	Tcl/Tk License
+LICENSE_FILE=	${WRKSRC}/../license.terms
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libcanberra.so:${PORTSDIR}/audio/libcanberra \
    		libnotify.so:${PORTSDIR}/devel/libnotify \
diff --git a/x11-toolkits/tktable/Makefile b/x11-toolkits/tktable/Makefile
index 6849ff083550..c78260cf738c 100644
--- a/x11-toolkits/tktable/Makefile
+++ b/x11-toolkits/tktable/Makefile
@@ -11,8 +11,10 @@ DISTNAME=	${PORTNAME:S/tk/Tk/}${PORTVERSION}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Table/matrix widget extension to Tk
 
-LICENSE=	BSD
-LICENSE_FILE=	${WRKSRC}/license.txt
+LICENSE=	TclTk
+LICENSE_NAME=	Tcl/Tk License
+LICENSE_FILE=	${WRKSRC}/../license.terms
+LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 USES+=		tk
 USE_LDCONFIG=	${PREFIX}/lib/${DISTNAME}
diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index df2058041354..62c7e8511944 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -9,7 +9,7 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Small window manager with themes and plugins
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 OPTIONS_DEFINE=	ESOUND XINERAMA
 OPTIONS_DEFAULT=	XINERAMA
diff --git a/x11/bbdock/Makefile b/x11/bbdock/Makefile
index 4d3cacad7812..f41cdc3e7eaa 100644
--- a/x11/bbdock/Makefile
+++ b/x11/bbdock/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES=	http://bbdock.nethence.com/download/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Application launcher for Blackbox-like window manager
 
-LICENSE=	BSD
+LICENSE=	BSD3CLAUSE
 
 LIB_DEPENDS=	libpng15.so:${PORTSDIR}/graphics/png