diff --git a/devel/xc3sprog/Makefile b/devel/xc3sprog/Makefile
index c6e2cd0d4699..38cb393e2bab 100644
--- a/devel/xc3sprog/Makefile
+++ b/devel/xc3sprog/Makefile
@@ -1,22 +1,25 @@
 PORTNAME=	xc3sprog
-PORTVERSION=	r769
-PORTREVISION=	1
+PORTVERSION=	g20221005
+PORTEPOCH=	1
 CATEGORIES=	devel
-MASTER_SITES=	http://opsec.eu/src/xc3sprog/
 
-MAINTAINER=	ports@FreeBSD.org
-COMMENT=	Free programmer for Xilinx Spartan S3E Starter Kit
-WWW=		https://sourceforge.net/projects/xc3sprog/
+MAINTAINER=	darius@dons.net.au
+COMMENT=	Free programmer for Xilinx FPGA and flash chips
+WWW=		https://github.com/DanielO/xc3sprog
+
+LICENSE=	GPLv2
+LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libftdi.so:devel/libftdi
 RUN_DEPENDS=	${LOCALBASE}/sbin/fxload:misc/fxload
 
-USES=		tar:xz cmake:insource
-ALL_TARGET=	xc3sprog
-
-PLIST_FILES=	bin/xc3sprog
+USES=		cmake
+USE_GITHUB=	yes
+GH_ACCOUNT=	DanielO
+GH_TAGNAME=	426b763
 
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/xc3sprog ${STAGEDIR}${PREFIX}/bin
+post-install:
+	${INSTALL_MAN} ${WRKSRC}/xc3sprog.1 \
+		${STAGEDIR}${PREFIX}/share/man/man1
 
 .include <bsd.port.mk>
diff --git a/devel/xc3sprog/distinfo b/devel/xc3sprog/distinfo
index b505ad488b6a..794e24fad2b8 100644
--- a/devel/xc3sprog/distinfo
+++ b/devel/xc3sprog/distinfo
@@ -1,2 +1,3 @@
-SHA256 (xc3sprog-r769.tar.xz) = 40fda2513f833ec84575d50a4e08e7b67f017a51efc732642c3a7af33bc831db
-SIZE (xc3sprog-r769.tar.xz) = 843208
+TIMESTAMP = 1664954167
+SHA256 (DanielO-xc3sprog-g20221005-426b763_GH0.tar.gz) = a1eebb29f27b07450cdc19aea471fbcc232ab800d5fa6978ed562388498f2ebe
+SIZE (DanielO-xc3sprog-g20221005-426b763_GH0.tar.gz) = 257352
diff --git a/devel/xc3sprog/files/patch-CMakeLists.txt b/devel/xc3sprog/files/patch-CMakeLists.txt
deleted file mode 100644
index 232e78f9ef20..000000000000
--- a/devel/xc3sprog/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./CMakeLists.txt.orig	2014-08-03 12:43:51.000000000 +0200
-+++ ./CMakeLists.txt	2014-08-03 21:12:45.000000000 +0200
-@@ -16,7 +16,7 @@
- ENDIF( ${CMAKE_COMPILER_IS_GNUCXX} )
- endif(${WIN32})
- 
--option(USE_FTD2XX "Use FTDI libFTD2XX instead of free libftdi" ON)
-+# option(USE_FTD2XX "Use FTDI libFTD2XX instead of free libftdi" ON)
- 
- find_package(libftdi)
- include_directories(${LIBFTDI_INCLUDE_DIR})
diff --git a/devel/xc3sprog/files/patch-utilities.cpp b/devel/xc3sprog/files/patch-utilities.cpp
deleted file mode 100644
index 3ca57af650bc..000000000000
--- a/devel/xc3sprog/files/patch-utilities.cpp
+++ /dev/null
@@ -1,10 +0,0 @@
---- ./utilities.cpp.orig	2014-08-03 12:33:22.000000000 +0200
-+++ ./utilities.cpp	2014-08-03 12:33:32.000000000 +0200
-@@ -5,6 +5,7 @@
- #include <stdio.h>
- #include <string.h>
- #include <strings.h>
-+#include <unistd.h>
- #include <memory>
- 
- #include "ioparport.h"
diff --git a/devel/xc3sprog/pkg-descr b/devel/xc3sprog/pkg-descr
index 58328d1530fd..7cff672b5dfc 100644
--- a/devel/xc3sprog/pkg-descr
+++ b/devel/xc3sprog/pkg-descr
@@ -1,2 +1,2 @@
-This tool should let you to program your Xilinx Spartan-3E Starter Kit and
-similar boards based on Xilinx USB programmers.
+This tool can be used to program Xilinx Spartan 3 and newer FPGA and
+platform flash with a Xilinx USB cable (and others)
diff --git a/devel/xc3sprog/pkg-message b/devel/xc3sprog/pkg-message
deleted file mode 100644
index 1e66953eb605..000000000000
--- a/devel/xc3sprog/pkg-message
+++ /dev/null
@@ -1,11 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-Visit:
-
-	http://wiki.freebsd.org/FPGA/
-
-for FreeBSD-specific usage.
-EOM
-}
-]
diff --git a/devel/xc3sprog/pkg-plist b/devel/xc3sprog/pkg-plist
new file mode 100644
index 000000000000..f80b0f64ee1a
--- /dev/null
+++ b/devel/xc3sprog/pkg-plist
@@ -0,0 +1,8 @@
+bin/bitparse
+bin/detectchain
+bin/jedecparse
+bin/readdna
+bin/srecparse
+bin/xc2c_warp
+bin/xc3sprog
+share/man/man1/xc3sprog.1.gz