diff --git a/misc/ollama/Makefile b/misc/ollama/Makefile
index a2ac9b7b35e8..5ed61c5c2de2 100644
--- a/misc/ollama/Makefile
+++ b/misc/ollama/Makefile
@@ -1,126 +1,127 @@
 PORTNAME=	ollama
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.18.0
+PORTREVISION=	1
 CATEGORIES=	misc # machine-learning
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Run Llama 2, Mistral, and other large language models
 WWW=		https://ollama.com \
 		https://github.com/ollama/ollama
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${LOCALBASE}/include/miniaudio/miniaudio.h:audio/miniaudio \
 		${LOCALBASE}/include/nlohmann/json_fwd.hpp:devel/nlohmann-json \
 		${LOCALBASE}/include/stb/stb_image.h:devel/stb
 
 USES=		cmake:indirect go:1.24+,modules localbase pkgconfig
 
 GO_MODULE=	github.com/yurivict/${PORTNAME} # fork with FreeBSD patches
 GO_TARGET=	.
 GO_ENV+=	CGO_CXXFLAGS="${CXXFLAGS}"
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MMLX}
 GO_BUILDFLAGS+=	-tags mlx
 .endif
 
 PLIST_FILES=	bin/${PORTNAME} \
 		bin/ollama-limit-gpu-layers
 
 OPTIONS_GROUP=		BACKENDS
 OPTIONS_GROUP_BACKENDS=	CPU VULKAN MLX
 OPTIONS_DEFAULT=	CPU VULKAN
 
 CPU_DESC=		Build CPU backend shared libraries
 CPU_PLIST_FILES=	lib/ollama/libggml-base.so \
 			lib/ollama/libggml-cpu-alderlake.so \
 			lib/ollama/libggml-cpu-haswell.so \
 			lib/ollama/libggml-cpu-icelake.so \
 			lib/ollama/libggml-cpu-sandybridge.so \
 			lib/ollama/libggml-cpu-skylakex.so \
 			lib/ollama/libggml-cpu-sse42.so \
 			lib/ollama/libggml-cpu-x64.so
 
 VULKAN_DESC=		Build Vulkan GPU backend shared library
 VULKAN_BUILD_DEPENDS=	glslc:graphics/shaderc \
 			${LOCALBASE}/include/vulkan/vulkan.h:graphics/vulkan-headers
 VULKAN_LIB_DEPENDS=	libvulkan.so:graphics/vulkan-loader
 VULKAN_PLIST_FILES=	lib/ollama/libggml-vulkan.so
 
 MLX_DESC=		Build MLX backend for image generation (CPU)
 MLX_PLIST_FILES=	lib/ollama/libmlx.so \
 			lib/ollama/libmlxc.so
 MLX_CMAKE_ON=		-DMLX_ENGINE:BOOL=ON
 
 _CMAKE_FLAGS=	-DCMAKE_BUILD_TYPE=Release -DGGML_BACKEND_DL=ON -DGGML_BACKEND_DIR=${PREFIX}/lib/ollama
 
 post-patch:
 	# change import path to the fork
 	@cd ${WRKSRC} && \
 		(${GREP} -rl ollama/ollama | ${XARGS} ${REINPLACE_CMD} -i '' -e 's|ollama/ollama|yurivict/ollama|g')
 	@${REINPLACE_CMD} -e 's|var Version string = "0.0.0"|var Version string = "${PORTVERSION}"|g' \
 		${WRKSRC}/go.mod ${WRKSRC}/version/version.go
 
 pre-build-CPU-on:
 	@${MKDIR} ${WRKSRC}/build && \
 		cd ${WRKSRC}/build && \
 		${CMAKE_BIN} ${_CMAKE_FLAGS} .. && \
 		${MAKE_CMD} ggml-base && \
 		${MAKE_CMD} ggml-cpu
 
 pre-build-VULKAN-on:
 .if !${PORT_OPTIONS:MCPU} && !${PORT_OPTIONS:MMLX}
 	@${MKDIR} ${WRKSRC}/build && \
 		cd ${WRKSRC}/build && \
 		${CMAKE_BIN} ${_CMAKE_FLAGS} ..
 .endif
 	@cd ${WRKSRC}/build && \
 		${MAKE_CMD} ggml-vulkan
 
 pre-build-MLX-on:
 .if !${PORT_OPTIONS:MCPU} && !${PORT_OPTIONS:MVULKAN}
 	@${MKDIR} ${WRKSRC}/build && \
 		cd ${WRKSRC}/build && \
 		${CMAKE_BIN} ${_CMAKE_FLAGS} -DMLX_ENGINE:BOOL=ON ..
 .endif
 	# Patch MLX after it's fetched by CMake (FreeBSD compatibility fix)
 	@if [ -f ${WRKSRC}/build/_deps/mlx-src/mlx/distributed/ring/ring.cpp ]; then \
 		${REINPLACE_CMD} -i '' -e '/^#include <fcntl.h>/a\\
 #include <netinet/in.h>' \
 			${WRKSRC}/build/_deps/mlx-src/mlx/distributed/ring/ring.cpp; \
 	fi
 	@cd ${WRKSRC}/build && \
 		${MAKE_CMD} mlx mlxc
 
 post-install: # pending https://github.com/ollama/ollama/issues/6407
 	${INSTALL_SCRIPT} ${FILESDIR}/ollama-limit-gpu-layers ${STAGEDIR}${PREFIX}/bin
 
 post-install-CPU-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ollama
 	${INSTALL_LIB} ${WRKSRC}/build/lib/ollama/libggml-base.so \
 		${STAGEDIR}${PREFIX}/lib/ollama/
 	@for f in ${WRKSRC}/build/lib/ollama/libggml-cpu*.so; do \
 		${INSTALL_LIB} $$f ${STAGEDIR}${PREFIX}/lib/ollama/; \
 	done
 
 post-install-VULKAN-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ollama
 	${INSTALL_LIB} ${WRKSRC}/build/lib/ollama/libggml-vulkan.so \
 		${STAGEDIR}${PREFIX}/lib/ollama/
 
 post-install-MLX-on:
 	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/ollama
 	${INSTALL_LIB} ${WRKSRC}/build/lib/ollama/libmlx.so \
 		${STAGEDIR}${PREFIX}/lib/ollama/
 	${INSTALL_LIB} ${WRKSRC}/build/lib/ollama/libmlxc.so \
 		${STAGEDIR}${PREFIX}/lib/ollama/
 
 do-test:
 	@cd ${WRKSRC} && \
 		${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${GO_ENV} ${GO_CMD} test ./...
 
 .include <bsd.port.mk>
diff --git a/misc/ollama/files/patch-x_imagegen_memory.go b/misc/ollama/files/patch-x_imagegen_memory.go
new file mode 100644
index 000000000000..86279bc6592e
--- /dev/null
+++ b/misc/ollama/files/patch-x_imagegen_memory.go
@@ -0,0 +1,11 @@
+--- x/imagegen/memory.go.orig	2026-03-12 23:02:15 UTC
++++ x/imagegen/memory.go
+@@ -31,7 +31,7 @@ func CheckPlatformSupport() error {
+ 			return fmt.Errorf("image generation on macOS requires Apple Silicon (arm64), got %s", runtime.GOARCH)
+ 		}
+ 		return nil
+-	case "linux", "windows":
++	case "linux", "windows", "freebsd":
+ 		// Linux/Windows: CUDA support (requires mlx or cuda build)
+ 		// The actual backend availability is checked at runtime
+ 		return nil