diff --git a/net-mgmt/subcalc/Makefile b/net-mgmt/subcalc/Makefile
index e06cd93dc69b..9daface523fd 100644
--- a/net-mgmt/subcalc/Makefile
+++ b/net-mgmt/subcalc/Makefile
@@ -2,14 +2,16 @@
 # $FreeBSD$
 
 PORTNAME=	subcalc
-PORTVERSION=	1.1
+DISTVERSIONPREFIX=	v
+DISTVERSION=	1.3
 CATEGORIES=	net-mgmt
-MASTER_SITES=	http://www.seccuris.com/documents/downloads/
 
 MAINTAINER=	csjp@FreeBSD.org
 COMMENT=	Advanced IP/IPv6 subnet calculation and discovery
 
-BROKEN=		unfetchable
+USE_GITHUB=     yes
+GH_ACCOUNT=     csjayp
+GH_PROJECT=     subcalc
 
 PLIST_FILES=	bin/subcalc man/man1/subcalc.1.gz
 
diff --git a/net-mgmt/subcalc/distinfo b/net-mgmt/subcalc/distinfo
index 599e4277a5d4..c7f7c989b2c5 100644
--- a/net-mgmt/subcalc/distinfo
+++ b/net-mgmt/subcalc/distinfo
@@ -1,2 +1,3 @@
-SHA256 (subcalc-1.1.tar.gz) = 19abf3974f3f145083afd6c3860be370b79e0a122982effcb20236e197acdadf
-SIZE (subcalc-1.1.tar.gz) = 7675
+TIMESTAMP = 1584559341
+SHA256 (csjayp-subcalc-v1.3_GH0.tar.gz) = 2e66e2bf9386bdb2042ec5c873f22c991776b4238d5deff542b3700ad24e97af
+SIZE (csjayp-subcalc-v1.3_GH0.tar.gz) = 8198
diff --git a/net-mgmt/subcalc/files/patch-Makefile b/net-mgmt/subcalc/files/patch-Makefile
index 8538a3d83217..363210787d9e 100644
--- a/net-mgmt/subcalc/files/patch-Makefile
+++ b/net-mgmt/subcalc/files/patch-Makefile
@@ -1,13 +1,23 @@
---- Makefile.orig	2014-06-20 23:09:15.019376097 +0800
-+++ Makefile	2014-06-20 23:09:26.777375032 +0800
-@@ -15,8 +15,8 @@ subcalc:	$(OBJS)
- 	$(CC) -o $@ $(OBJS) $(LIBS)
+--- Makefile.orig	2018-06-30 14:11:02.000000000 -0700
++++ Makefile	2020-03-18 08:43:27.327184000 -0700
+@@ -13,14 +13,14 @@
+ 	$(CC) -o $@ $(OBJS) $(LIBS) $(CFLAGS)
  
  install:
+-	[ -d $(PREFIX)/bin ] || mkdir -p $(PREFIX)/bin
 -	cp subcalc $(PREFIX)/bin
--	cp subcalc.1.gz $(PREFIX)/man/man1/
+-	[ -d $(PREFIX)/share/man/man1/ ] || mkdir -p $(PREFIX)/share/man/man1/
+-	cp subcalc.1 $(PREFIX)/share/man/man1/
++	[ -d $(DESTDIR)$(PREFIX)/bin ] || mkdir -p $(DESTDIR)$(PREFIX)/bin
 +	cp subcalc $(DESTDIR)$(PREFIX)/bin
-+	cp subcalc.1.gz $(DESTDIR)$(PREFIX)/man/man1/
++	[ -d $(DESTDIR)$(PREFIX)/man/man1/ ] || mkdir -p $(DESTDIR)$(PREFIX)/man/man1/
++	cp subcalc.1 $(DESTDIR)$(PREFIX)/man/man1/
  
  deinstall:
- 	rm -f $(PREFIX)/man/man1/subcalc.1.gz
+-	rm -f $(PREFIX)/share/man/man1/subcalc.1.gz
+-	rm -f $(PREFIX)/bin/subcalc
++	rm -f $(DESTDIR)$(PREFIX)/man/man1/subcalc.1.gz
++	rm -f $(DESTDIR)$(PREFIX)/bin/subcalc
+ 
+ clean:
+ 	rm -f subcalc