diff --git a/net/hanstunnel/Makefile b/net/hanstunnel/Makefile
index 1f3b74cece3c..0832da1c8700 100644
--- a/net/hanstunnel/Makefile
+++ b/net/hanstunnel/Makefile
@@ -4,13 +4,12 @@
 PORTNAME=	hans
 PORTVERSION=	0.4.1
 CATEGORIES=	net security
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	/hanstunnel/source/
+MASTER_SITES=	SF/hanstunnel/source
 
 MAINTAINER=	vsityz@gmail.com
 COMMENT=	Hans makes it possible to tunnel IPv4 through ICMP
 
-LICENSE_PERMS_GPL3=	yes
+LICENSE=	GPLv3
 
 OPTIONS_DEFINE=	CLANG
 
@@ -20,6 +19,8 @@ OPTIONS_DEFAULT=	CLANG
 
 PLIST_FILES=	bin/hans
 
+SUB_FILES=	pkg-message
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCLANG}
@@ -38,7 +39,7 @@ CPP=gcpp
 .endif
 
 do-install:
-	@${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m ${BINMODE} ${WRKSRC}/hans ${LOCALBASE}/bin
+	@${INSTALL_PROGRAM} ${WRKSRC}/hans ${LOCALBASE}/bin
 
 post-install:	.SILENT
 	${ECHO_MSG}
diff --git a/net/hanstunnel/pkg-message b/net/hanstunnel/files/pkg-message.in
similarity index 100%
rename from net/hanstunnel/pkg-message
rename to net/hanstunnel/files/pkg-message.in