diff --git a/devel/linux_libusb/Makefile b/devel/linux_libusb/Makefile
index feb1f6547b32..4effd70385bf 100644
--- a/devel/linux_libusb/Makefile
+++ b/devel/linux_libusb/Makefile
@@ -1,105 +1,83 @@
 # Created by: nox@FreeBSD.org
 
 PORTNAME=	linux_libusb
-PORTVERSION=	13.0r${FSVN_REV}
-PORTREVISION=	4
+PORTVERSION=	13.1.0
 CATEGORIES=	devel linux
-MASTER_SITES=	http://www.selasky.org/hans_petter/distfiles/ \
-		http://home.selasky.org/distfiles/
 
-MAINTAINER=	emulation@FreeBSD.org
-COMMENT=	Linux-compatibility libusb
+MAINTAINER=	hselasky@FreeBSD.org
+COMMENT=	Linux-compatibility LibUSB
 
 LICENSE=	BSD2CLAUSE
 
 ONLY_FOR_ARCHS=	aarch64 amd64 i386
 
 USES=		linux tar:bzip2
+
+USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 USE_LINUX=	base:build,run devtools:build
 USE_LINUX_PREFIX=	yes
 
+GH_ACCOUNT=	hselasky
+
 LIBDIR_aarch64=	lib64
 LIBDIR_amd64=	lib64
 LIBDIR_i386=	lib
 PLIST_FILES=	usr/${LIBDIR_${ARCH}}/libusb.so.3 \
 		usr/${LIBDIR_${ARCH}}/libusb-0.1.so.4 \
 		usr/${LIBDIR_${ARCH}}/libusb-1.0.so.0
 
 CC=		${LINUXBASE}/usr/bin/gcc --sysroot=${LINUXBASE}
 CFLAGS:=	${CFLAGS:N-march=*}
 CFLAGS+=	-I${WRKDIR}/${DISTNAME}/include
 SSP_CFLAGS?=	-fstack-protector # XXX -strong isn't supported by GCC < 4.9
 MAKE_ARGS+=	LIBUSB_GLOBAL_INCLUDE_FILE=libusb_global_linux.h
 MAKE_ARGS+=	WITHOUT_PROFILE=yes
 MAKE_ARGS+=	WITHOUT_SSP=yes
 MAKE_ARGS+=	WITHOUT_WERROR=yes
 MAKE_ARGS+=	__MAKE_CONF=""
 MAKE_ENV+=	LDADD="-lrt"
 
-# see: sysutils/pc-sysinstall/Makefile
-FSVN_REV=	358841
-FSVNPATH?=	http://svn.freebsd.org/base/head
-FSVNDIR=	lib/libusb
-
 .include <bsd.port.pre.mk>
 
 .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1300134
 MAKE_ARGS+=	NO_WERROR=yes
 .endif
 
 .if ${ARCH} == amd64
 PLIST_FILES+=	usr/lib/libusb.so.3 \
 		usr/lib/libusb-0.1.so.4 \
 		usr/lib/libusb-1.0.so.0
 .endif
 
 do-build:
 	${MKDIR} ${WRKSRC}/${LIBDIR_${ARCH}}
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} MAKEOBJDIR=${LIBDIR_${ARCH}} \
 		${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} ${_MAKE_JOBS} \
 		${MAKE_ARGS:N${DESTDIRNAME}=*}
 .if ${ARCH} == amd64
 	${MKDIR} ${WRKSRC}/lib
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV:NCC=*} CC="${CC} -m32" \
 		MAKEOBJDIR=lib ${MAKE_CMD} ${MAKE_FLAGS} ${MAKEFILE} \
 		${_MAKE_JOBS} ${MAKE_ARGS:N${DESTDIRNAME}=*} COMPAT_32BIT=yes
 .endif
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}
 	${INSTALL_LIB} ${WRKSRC}/${LIBDIR_${ARCH}}/libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}
 	${LN} -s libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}/libusb-0.1.so.4
 	${LN} -s libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/${LIBDIR_${ARCH}}/libusb-1.0.so.0
 .if ${ARCH} == amd64
 	${MKDIR} ${STAGEDIR}${PREFIX}/usr/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/lib
 	${LN} -s libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/lib/libusb-0.1.so.4
 	${LN} -s libusb.so.3 \
 		${STAGEDIR}${PREFIX}/usr/lib/libusb-1.0.so.0
 .endif
 
-.if defined(BOOTSTRAP) || defined(SVN_FETCH)
-SVN?=		svnlite
-
-do-fetch:
-	${RM} -rf ${WRKDIR}
-	${MKDIR} ${WRKDIR}
-	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/${FSVNDIR} ${WRKDIR}/${DISTNAME}
-	${MKDIR} ${WRKDIR}/${DISTNAME}/include/compat/linux
-	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/compat/linux/linux_ioctl.h ${WRKDIR}/${DISTNAME}/include/compat/linux/
-	${MKDIR} ${WRKDIR}/${DISTNAME}/include/dev/usb
-	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usb_endian.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
-	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usb_freebsd.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
-	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usb.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
-	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usbdi.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
-	${SVN} export -r ${FSVN_REV} ${FSVNPATH}/sys/dev/usb/usb_ioctl.h ${WRKDIR}/${DISTNAME}/include/dev/usb/
-	cd ${WRKDIR}; tar --uid=0 --gid=0 -cvyf ${DISTDIR}/${DISTNAME}.tar.bz2 ${DISTNAME}
-.endif
-
 .include <bsd.port.post.mk>
diff --git a/devel/linux_libusb/distinfo b/devel/linux_libusb/distinfo
index cf25b640cff3..8d246c53daaa 100644
--- a/devel/linux_libusb/distinfo
+++ b/devel/linux_libusb/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1583857275
-SHA256 (linux_libusb-13.0r358841.tar.bz2) = 0114a83eb21889ff54e1f2f551296ef584e7fe1a8d468ade6ec1bc017937deb7
-SIZE (linux_libusb-13.0r358841.tar.bz2) = 69877
+TIMESTAMP = 1646223126
+SHA256 (hselasky-linux_libusb-13.1.0_GH0.tar.gz) = 1c2eca07aaba1af10a51ce263938dea78b79efdd5616af6f58665188de455825
+SIZE (hselasky-linux_libusb-13.1.0_GH0.tar.gz) = 89639
diff --git a/devel/linux_libusb/pkg-descr b/devel/linux_libusb/pkg-descr
index ba773069aa58..3f45694d12ac 100644
--- a/devel/linux_libusb/pkg-descr
+++ b/devel/linux_libusb/pkg-descr
@@ -1,12 +1,6 @@
-linux-libusb takes advantage of FreeBSD libusb(8) library, which got
-prepared to work correctly within linux(4) emulation layer. It lets
-you to take Linux binary linked with libusb.so and use it on
+linux_libusb takes advantage of the FreeBSD's libusb(8) library, which
+got prepared to work correctly within the linux(4) emulation layer. It
+lets you to take Linux binary linked with libusb.so and use it on
 FreeBSD.
 
-Additional information: This port has been prepared under FreeBSD
-with kern.osreldate = 1000510. It relies on the fact the libusb(8)
-API seems to be stable and no changes have been made to internal API
-for a long time. If this assumption isn't true, port won't work.
-Please submit bug report to the port maintainter in that case.
-
-WWW: http://lists.freebsd.org/pipermail/freebsd-usb/2014-March/012854.html
+WWW: https://github.com/hselasky/linux_libusb