diff --git a/archivers/mscompress/Makefile b/archivers/mscompress/Makefile
index c094c3babfc4..56cf79b3391d 100644
--- a/archivers/mscompress/Makefile
+++ b/archivers/mscompress/Makefile
@@ -1,27 +1,24 @@
 PORTNAME=	mscompress
-PORTVERSION=	0.3
+DISTVERSION=	0.4
 CATEGORIES=	archivers
-MASTER_SITES=	SUNSITE/utils/compress
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Microsoft "compress.exe/expand.exe" compatible (de)compressor
+WWW=		https://github.com/stapelberg/mscompress
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USES=		tar:bzip2
+USES=		autoreconf
+USE_GITHUB=	yes
+GH_ACCOUNT=	stapelberg
+
 HAS_CONFIGURE=	yes
 
 CONFLICTS_INSTALL=	foo2zjs # bin/msexpand
 
 PLIST_FILES=	bin/mscompress bin/msexpand \
 		share/man/man1/mscompress.1.gz \
 		share/man/man1/msexpand.1.gz
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/mscompress ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_PROGRAM} ${WRKSRC}/msexpand ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_MAN} ${WRKSRC}/mscompress.1 ${STAGEDIR}${PREFIX}/share/man/man1
-	${INSTALL_MAN} ${WRKSRC}/msexpand.1 ${STAGEDIR}${PREFIX}/share/man/man1
-
 .include <bsd.port.mk>
diff --git a/archivers/mscompress/distinfo b/archivers/mscompress/distinfo
index d03242e27678..4478ebf29483 100644
--- a/archivers/mscompress/distinfo
+++ b/archivers/mscompress/distinfo
@@ -1,2 +1,3 @@
-SHA256 (mscompress-0.3.tar.bz2) = cdc3bf66865da9700d5f52a06602dfe3f9a6510bc53b97342957b1d71f026b77
-SIZE (mscompress-0.3.tar.bz2) = 40989
+TIMESTAMP = 1716868983
+SHA256 (stapelberg-mscompress-0.4_GH0.tar.gz) = 71ca0f6216e0be5315ec80c5699c4026a7b7c9872a6248510d3cdf56377da83f
+SIZE (stapelberg-mscompress-0.4_GH0.tar.gz) = 13379
diff --git a/archivers/mscompress/files/patch-mscompress.c b/archivers/mscompress/files/patch-mscompress.c
deleted file mode 100644
index 6b2181be9ac9..000000000000
--- a/archivers/mscompress/files/patch-mscompress.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- mscompress.c.orig	2000-04-15 13:15:38 UTC
-+++ mscompress.c
-@@ -306,7 +306,7 @@ usage (char *progname)
-   exit (0);
- }
- 
--void
-+int
- main (int argc, char **argv)
- {
-   int in, out;
diff --git a/archivers/mscompress/files/patch-msexpand.c b/archivers/mscompress/files/patch-msexpand.c
deleted file mode 100644
index 781a778fd7c4..000000000000
--- a/archivers/mscompress/files/patch-msexpand.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- msexpand.c.orig	2000-04-15 13:15:45 UTC
-+++ msexpand.c
-@@ -215,7 +215,7 @@ usage (char *progname)
-   exit (0);
- }
- 
--void
-+int
- main (int argc, char **argv)
- {
-   int in, out;