diff --git a/net/bwm-ng/Makefile b/net/bwm-ng/Makefile
index 202081931cb..07e650ebc8d 100644
--- a/net/bwm-ng/Makefile
+++ b/net/bwm-ng/Makefile
@@ -1,10 +1,9 @@
 COMMENT=	realtime bandwidth monitoring of interfaces
 
-DISTNAME=	bwm-ng-0.6.1
-REVISION=	3
+DISTNAME=	bwm-ng-0.6.3
 CATEGORIES=	net
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=bwmng/}
-HOMEPAGE=	http://www.gropp.org/
+MASTER_SITES=	https://www.gropp.org/bwm-ng/
+HOMEPAGE=	https://www.gropp.org/?id=projects&sub=bwm-ng
 
 # GPLv2+
 PERMIT_PACKAGE=   Yes
@@ -12,10 +11,13 @@ PERMIT_PACKAGE=   Yes
 # uses pledge()
 WANTLIB=	c curses
 
-CONFIGURE_STYLE=	gnu
+CONFIGURE_STYLE=	autoreconf
 CONFIGURE_ARGS+=	--without-libstatgrab \
 			--without-netstatbsd
 
+AUTOCONF_VERSION=	2.71
+AUTOMAKE_VERSION=	1.16
+
 post-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/share/examples/bwm-ng
 	${INSTALL_DATA} ${WRKSRC}/bwm-ng.css ${PREFIX}/share/examples/bwm-ng
diff --git a/net/bwm-ng/distinfo b/net/bwm-ng/distinfo
index e2b87a9e788..dab85951b55 100644
--- a/net/bwm-ng/distinfo
+++ b/net/bwm-ng/distinfo
@@ -1,2 +1,2 @@
-SHA256 (bwm-ng-0.6.1.tar.gz) = AnzzyWDNlvyf+s33cT32LQ/FXu70oTiCifimKuXlDfA=
-SIZE (bwm-ng-0.6.1.tar.gz) = 162620
+SHA256 (bwm-ng-0.6.3.tar.gz) = waVStv9I6j5OEBEKfBiIYavEdQvvxnxsqrqOs+z2f0Y=
+SIZE (bwm-ng-0.6.3.tar.gz) = 70094
diff --git a/net/bwm-ng/patches/patch-src_bwm-ng_c b/net/bwm-ng/patches/patch-src_bwm-ng_c
index 5755300707a..a83f8e96fd9 100644
--- a/net/bwm-ng/patches/patch-src_bwm-ng_c
+++ b/net/bwm-ng/patches/patch-src_bwm-ng_c
@@ -4,7 +4,7 @@ route: retrieves interface stats via sysctl
 Index: src/bwm-ng.c
 --- src/bwm-ng.c.orig
 +++ src/bwm-ng.c
-@@ -211,6 +211,13 @@ int main (int argc, char *argv[]) {
+@@ -210,6 +210,13 @@ int main (int argc, char *argv[]) {
  	/* end of init curses, now set a sigint handler to deinit the screen on ctrl-break */
  	signal(SIGINT,sigint);
  	signal(SIGTERM,sigint);
diff --git a/net/bwm-ng/patches/patch-src_help_c b/net/bwm-ng/patches/patch-src_help_c
deleted file mode 100644
index ea17cd9ae55..00000000000
--- a/net/bwm-ng/patches/patch-src_help_c
+++ /dev/null
@@ -1,14 +0,0 @@
---- src/help.c.orig	Sun Apr 16 15:31:51 2017
-+++ src/help.c	Sun Apr 16 15:32:01 2017
-@@ -24,9 +24,9 @@
- #include "global_vars.h"
- #include "help.h"
- 
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr);
-+void print_help_line(const char *short_c,const char * long_c,const char *descr);
- 
--inline void print_help_line(const char *short_c,const char * long_c,const char *descr) {
-+void print_help_line(const char *short_c,const char * long_c,const char *descr) {
- #ifdef LONG_OPTIONS
-     printf("  %-23s",long_c);
- #else