diff --git a/misc/llama-cpp/Makefile b/misc/llama-cpp/Makefile
index 13a6e14455fd..7b1703cd2160 100644
--- a/misc/llama-cpp/Makefile
+++ b/misc/llama-cpp/Makefile
@@ -1,109 +1,109 @@
 PORTNAME=	llama-cpp
 DISTVERSIONPREFIX=	b
 DISTVERSION=	9426
 PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 DIST_SUBDIR=	${PORTNAME}-${DISTVERSION}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Facebook's LLaMA model in C/C++ # '
-WWW=		https://github.com/ggerganov/llama.cpp
+WWW=		https://github.com/ggml-org/llama.cpp
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cmake:testing compiler:c++11-lang python:run shebangfix ssl
 
 LIB_DEPENDS=	libggml-base.so:misc/ggml
 
 BUILD_DEPENDS=	npm:www/npm
 FETCH_DEPENDS=	npm:www/npm \
 		${LOCALBASE}/share/certs/ca-root-nss.crt:security/ca_root_nss
 
 BROKEN_armv7=	clang crashes, see https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=278810
-BROKEN_i386=	compilation fails, see https://github.com/ggerganov/llama.cpp/issues/9545
+BROKEN_i386=	compilation fails, see https://github.com/ggml-org/llama.cpp/issues/9545
 
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	ggerganov
+GH_ACCOUNT=	ggml-org
 GH_PROJECT=	llama.cpp
 
 DISTFILES+=	llama-ui-npm-${DISTVERSION}${EXTRACT_SUFX}
 
 SHEBANG_GLOB=	*.py
 
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		LLAMA_USE_SYSTEM_GGML
 CMAKE_OFF=	GGML_NATIVE \
 		FREEBSD_ALLOW_ADVANCED_CPU_FEATURES \
 		LLAMA_BUILD_TESTS
 CMAKE_TESTING_ON=	LLAMA_BUILD_TESTS
 
 # user for llama-server, only used when EXAMPLES=ON
 USER=		nobody
 SUB_LIST=	USER=${USER}
 
 PLIST_SUB+=	DISTVERSION=${DISTVERSION}
 
 OPTIONS_DEFINE=		EXAMPLES
 OPTIONS_DEFAULT=	EXAMPLES
 OPTIONS_SUB=		yes
 
 EXAMPLES_CMAKE_BOOL=	LLAMA_BUILD_EXAMPLES
 
 BINARY_ALIAS=	git=false \
 		python=${PYTHON_CMD} # for tests
 
 do-fetch:
 	# Fetch the main GH source tarball
 	@if ! [ -f ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME}${EXTRACT_SUFX} ]; then \
 		${MKDIR} ${DISTDIR}/${DIST_SUBDIR}; \
 		cd ${DISTDIR}/${DIST_SUBDIR} && \
 			${SETENV} ${FETCH_ENV} ${FETCH_CMD} ${FETCH_BEFORE_ARGS} \
 				https://codeload.github.com/${GH_ACCOUNT}/${GH_PROJECT}/tar.gz/${DISTVERSIONPREFIX}${DISTVERSION}?dummy=/${DISTNAME}${EXTRACT_SUFX} \
 				${FETCH_AFTER_ARGS}; \
 	fi
 	# Download npm dependencies for the WebUI
 	@if ! [ -f ${DISTDIR}/${DIST_SUBDIR}/llama-ui-npm-${DISTVERSION}${EXTRACT_SUFX} ]; then \
 		${SETENV} TMPDIR=${WRKDIR} LOCALBASE=${LOCALBASE} \
 			${SH} ${FILESDIR}/fetch-ui.sh \
 			${DISTVERSION} \
 			${DISTDIR}/${DIST_SUBDIR} \
 			${DISTNAME}${EXTRACT_SUFX} \
 				${FILESDIR}; \
 	fi
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/tools/ui/node_modules
 	@${TAR} -xzf ${DISTDIR}/${DIST_SUBDIR}/llama-ui-npm-${DISTVERSION}${EXTRACT_SUFX} -C ${WRKSRC}/tools/ui/node_modules --strip-components 1
 	@cd ${WRKSRC}/tools/ui && \
 		${SETENV} HOME=${WRKSRC} npm run build
 
 post-patch: # set version in the code
 	@${REINPLACE_CMD} \
 		-e "s|set(BUILD_NUMBER 0)|set(BUILD_NUMBER ${DISTVERSION})|" \
 		${WRKSRC}/cmake/build-info.cmake
 
-do-test-ci: # build of tests fails, see https://github.com/ggerganov/llama.cpp/issues/10955
+do-test-ci: # build of tests fails, see https://github.com/ggml-org/llama.cpp/issues/10955
 	@cd ${WRKSRC} && \
 		${SETENV} ${MAKE_ENV} bash ci/run.sh ./tmp/results ./tmp/mnt
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEXAMPLES}
 USE_RC_SUBR=	llama-server
 .endif
 
-# tests as of 4458: 97% tests passed, 1 tests failed out of 31, see https://github.com/ggerganov/llama.cpp/issues/11036
+# tests as of 4458: 97% tests passed, 1 tests failed out of 31, see https://github.com/ggml-org/llama.cpp/issues/11036
 
 # tests as of 4649:
 # 88% tests passed, 4 tests failed out of 32
 # The following tests FAILED:
-#         18 - test-chat (Subprocess aborted)                    main   # see https://github.com/ggerganov/llama.cpp/issues/11705
+#         18 - test-chat (Subprocess aborted)                    main   # see https://github.com/ggml-org/llama.cpp/issues/11705
 #         24 - test-gguf (SEGFAULT)                              main
 #         25 - test-backend-ops (SEGFAULT)                       main
 #         32 - test-eval-callback (SEGFAULT)                     curl eval-callback
 
 .include <bsd.port.mk>
diff --git a/misc/llama-cpp/distinfo b/misc/llama-cpp/distinfo
index 358c8a9445a8..14b093456078 100644
--- a/misc/llama-cpp/distinfo
+++ b/misc/llama-cpp/distinfo
@@ -1,5 +1,5 @@
-TIMESTAMP = 1780888522
+TIMESTAMP = 1784012194
 SHA256 (llama-cpp-9426/llama-ui-npm-9426.tar.gz) = d472fb606a4c2cfd365ffacba2e3ae49316a512199d09c41c9970aa395ea87f7
 SIZE (llama-cpp-9426/llama-ui-npm-9426.tar.gz) = 68283814
-SHA256 (llama-cpp-9426/ggerganov-llama.cpp-b9426_GH0.tar.gz) = a96658491547aa923980dbffc25179b0f1164ad3dab40126673414ebf947238c
-SIZE (llama-cpp-9426/ggerganov-llama.cpp-b9426_GH0.tar.gz) = 33982934
+SHA256 (llama-cpp-9426/ggml-org-llama.cpp-b9426_GH0.tar.gz) = a96658491547aa923980dbffc25179b0f1164ad3dab40126673414ebf947238c
+SIZE (llama-cpp-9426/ggml-org-llama.cpp-b9426_GH0.tar.gz) = 33982934