diff --git a/converters/libb64/Makefile b/converters/libb64/Makefile
index b93acd881d21..a3e95857a655 100644
--- a/converters/libb64/Makefile
+++ b/converters/libb64/Makefile
@@ -1,24 +1,26 @@
 PORTNAME=	libb64
-PORTVERSION=	1.2.1
+DISTVERSION=	2.0.0-15
 CATEGORIES=	converters mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}
 
 MAINTAINER=	ismail.yenigul@surgate.com
 COMMENT=	Library for fast Base64 encoding and decoding
-WWW=		https://libb64.sourceforge.net/
+WWW=		https://github.com/stefantalpalaru/libb64
 
-BUILD_DEPENDS=	makedepend:devel/makedepend
+LICENSE=	MIT
 
-USES=		gmake zip
-ALL_TARGET=	all_src
+USES=		cmake:testing
 USE_LDCONFIG=	yes
 
-do-install:
-	${INSTALL_DATA} ${WRKSRC}/src/libb64.a ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_LIB} ${WRKSRC}/src/libb64.so.0 ${STAGEDIR}${PREFIX}/lib
-	${LN} -fs libb64.so.0 ${STAGEDIR}${PREFIX}/lib/libb64.so
-	@${MKDIR} ${STAGEDIR}${PREFIX}/include/b64
-	${INSTALL_DATA} ${WRKSRC}/include/b64/*.h \
-		${STAGEDIR}${PREFIX}/include/b64
+USE_GITHUB=	yes
+GH_ACCOUNT=	stefantalpalaru
+GH_TAGNAME=	382c274
+
+CMAKE_TESTING_ON=	LIBB64_BUILD_EXAMPLES LIBB64_ENABLE_TESTS
+CMAKE_OFF=	LIBB64_BUILD_EXAMPLES LIBB64_BUILD_PROGRAMS LIBB64_ENABLE_TESTS
+CMAKE_ON=	LIBB64_SHARED
+
+post-install:
+	${RLN} ${STAGEDIR}${PREFIX}/lib/libb64.so ${STAGEDIR}${PREFIX}/lib/libb64.so.0
 
 .include <bsd.port.mk>
diff --git a/converters/libb64/distinfo b/converters/libb64/distinfo
index 707945707cb3..8386204aa7fa 100644
--- a/converters/libb64/distinfo
+++ b/converters/libb64/distinfo
@@ -1,2 +1,3 @@
-SHA256 (libb64-1.2.1.zip) = 20106f0ba95cfd9c35a13c71206643e3fb3e46512df3e2efb2fdbf87116314b2
-SIZE (libb64-1.2.1.zip) = 23316
+TIMESTAMP = 1711281226
+SHA256 (stefantalpalaru-libb64-2.0.0-15-382c274_GH0.tar.gz) = d317f7db8c000b6e268b4b4efaee72e892abbb188c4581a64b157221d2d461ca
+SIZE (stefantalpalaru-libb64-2.0.0-15-382c274_GH0.tar.gz) = 25074
diff --git a/converters/libb64/files/patch-src_Makefile b/converters/libb64/files/patch-src_Makefile
deleted file mode 100644
index 4d6e71375ef8..000000000000
--- a/converters/libb64/files/patch-src_Makefile
+++ /dev/null
@@ -1,40 +0,0 @@
---- src/Makefile.orig	2013-06-18 12:49:36 UTC
-+++ src/Makefile
-@@ -1,9 +1,10 @@
--LIBRARIES = libb64.a
-+LIBRARIES = libb64.a libb64.so
-+SOVERSION ?= 0
- 
- # Build flags (uncomment one)
- #############################
- # Release build flags
--CFLAGS += -O3
-+#CFLAGS += -O3
- #############################
- # Debug build flags
- #CFLAGS += -g
-@@ -15,7 +16,7 @@ TARGETS = $(LIBRARIES)
- 
- LINK.o = gcc
- 
--CFLAGS += -Werror -pedantic
-+CFLAGS += -Werror -pedantic -fsigned-char
- CFLAGS += -I../include
- 
- vpath %.h ../include/b64
-@@ -27,6 +28,15 @@ all: $(TARGETS) #strip
- libb64.a: cencode.o cdecode.o
- 	$(AR) $(ARFLAGS) $@ $^
- 
-+libb64.so.$(SOVERSION): cencode.So cdecode.So
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,-soname,$@ -o $@ $^
-+
-+%.So: %.c
-+	$(CC) -fPIC -c $(CFLAGS) $(CPPFLAGS) $< -o $@
-+
-+%.so: %.so.$(SOVERSION)
-+	ln -fs $< $@
-+
- strip:
- 	strip $(BINARIES) *.exe
- 
diff --git a/converters/libb64/pkg-plist b/converters/libb64/pkg-plist
index c0fcae5aee6a..05233831c285 100644
--- a/converters/libb64/pkg-plist
+++ b/converters/libb64/pkg-plist
@@ -1,7 +1,18 @@
+include/b64/ccommon.h
 include/b64/cdecode.h
 include/b64/cencode.h
 include/b64/decode.h
 include/b64/encode.h
-lib/libb64.a
+lib/cmake/libb64/libb64-config-version.cmake
+lib/cmake/libb64/libb64-config.cmake
+lib/cmake/libb64/libb64-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libb64/libb64-targets.cmake
 lib/libb64.so
 lib/libb64.so.0
+%%DOCSDIR%%/AUTHORS.md
+%%DOCSDIR%%/BENCHMARKS.md
+%%DOCSDIR%%/CHANGELOG.md
+%%DOCSDIR%%/INSTALL.md
+%%DOCSDIR%%/LICENSE.md
+%%DOCSDIR%%/README.md
+%%DOCSDIR%%/TODO.md