diff --git a/net-mgmt/bgpq/Makefile b/net-mgmt/bgpq/Makefile
index 1a83768cdb07..43d839320dc2 100644
--- a/net-mgmt/bgpq/Makefile
+++ b/net-mgmt/bgpq/Makefile
@@ -5,13 +5,17 @@ PORTNAME=	bgpq
 PORTVERSION=	1.0.9.9
 CATEGORIES=	net-mgmt
 MASTER_SITES=	http://snar.spb.ru/prog/bgpq/
-EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Bgpq - lightweight access-list generator for Cisco routers
 
-PLIST_FILES=	bin/bgpq man/man8/bgpq.8.gz
+LICENSE=	BSD2CLAUSE BSD4CLAUSE # latter for utils.c
+LICENSE_COMB=	multi
+LICENSE_FILE_BSD2CLAUSE=	${WRKSRC}/COPYRIGHT
 
+USES=		tar:tgz
 GNU_CONFIGURE=	yes
 
+PLIST_FILES=	bin/bgpq man/man8/bgpq.8.gz
+
 .include <bsd.port.mk>
diff --git a/net-mgmt/bgpq/files/patch-Makefile.in b/net-mgmt/bgpq/files/patch-Makefile.in
index 2093f5754974..b6abe0ed8062 100644
--- a/net-mgmt/bgpq/files/patch-Makefile.in
+++ b/net-mgmt/bgpq/files/patch-Makefile.in
@@ -6,8 +6,8 @@
  install: bgpq
 -	$(INSTALL) -s -m 755 bgpq @prefix@@bindir@
 -	$(INSTALL) -m 644 bgpq.8 @prefix@@mandir@/man8
-+	$(INSTALL) -s -m 755 bgpq $(DESTDIR)@prefix@@bindir@
-+	$(INSTALL) -m 644 bgpq.8 $(DESTDIR)@mandir@/man8
++	$(BSD_INSTALL_PROGRAM) bgpq $(DESTDIR)@prefix@@bindir@
++	$(BSD_INSTALL_MAN) bgpq.8 $(DESTDIR)@mandir@/man8
  
  test: bgpq
  	@rm -f test.out ]
diff --git a/net-mgmt/bgpq/pkg-descr b/net-mgmt/bgpq/pkg-descr
index e9af758fd2c7..643042923e24 100644
--- a/net-mgmt/bgpq/pkg-descr
+++ b/net-mgmt/bgpq/pkg-descr
@@ -1,4 +1,3 @@
-
 This program is a lightweight access- and prefix-list generator
 for Cisco routers and GateD/Zebra. Access lists are generated
 based on RADB/RIPE data.