diff --git a/www/ot-recorder/Makefile b/www/ot-recorder/Makefile
index 2fe9cd4fac3b..aa8532f9002f 100644
--- a/www/ot-recorder/Makefile
+++ b/www/ot-recorder/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	ot-recorder
-PORTVERSION=	0.9.2
+PORTVERSION=	0.9.6
 CATEGORIES=	www
 
 MAINTAINER=	dvl@FreeBSD.org
 COMMENT=	Store and access data published by OwnTracks apps
 WWW=		https://github.com/owntracks/recorder
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	curl>0:ftp/curl \
 		e2fsprogs-libuuid>0:misc/e2fsprogs-libuuid \
 		libconfig>0:devel/libconfig \
 		lmdb>0:databases/lmdb \
 		mosquitto>0:net/mosquitto \
 		pkgconf>0:devel/pkgconf
 
 LIB_DEPENDS=	libconfig.so:devel/libconfig \
 		libcurl.so:ftp/curl \
 		liblmdb.so:databases/lmdb \
 		libmosquitto.so:net/mosquitto
 
 USES=		gmake
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	owntracks
 GH_PROJECT=	recorder
 
 USERS=		ot-recorder
 GROUPS=		ot-recorder
 
 SUB_FILES=	ot-recorder
 
 post-patch:
 	${CP} ${WRKSRC}/config.mk.in ${WRKSRC}/config.mk
 
 .include <bsd.port.pre.mk>
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/ocat        ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_PROGRAM} ${WRKSRC}/ot-recorder ${STAGEDIR}${PREFIX}/sbin
 
 	${MKDIR} ${STAGEDIR}${WWWDIR}
 	(cd ${WRKSRC}/docroot && ${COPYTREE_SHARE} . ${STAGEDIR}${WWWDIR}/)
 
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${WRKSRC}/etc/ot-recorder.default ${STAGEDIR}${ETCDIR}/ot-recorder.conf.sample
 
 	${MKDIR} ${STAGEDIR}/var/log/ot-recorder
 	${MKDIR} ${STAGEDIR}/var/db/owntracks
 	${MKDIR} ${STAGEDIR}/var/db/owntracks/recorder
 	${MKDIR} ${STAGEDIR}/var/run/ot-recorder
 
 	${INSTALL_SCRIPT} ${WRKDIR}/ot-recorder ${STAGEDIR}$/${PREFIX}/etc/rc.d/
 
 .include <bsd.port.post.mk>
diff --git a/www/ot-recorder/distinfo b/www/ot-recorder/distinfo
index 2f6325b98900..f0623894f153 100644
--- a/www/ot-recorder/distinfo
+++ b/www/ot-recorder/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1670173683
-SHA256 (owntracks-recorder-0.9.2_GH0.tar.gz) = d3632895e46c36c1e484c021958e7bfee3b8977942ab28e7d47cf69c974f988e
-SIZE (owntracks-recorder-0.9.2_GH0.tar.gz) = 3306898
+TIMESTAMP = 1698236446
+SHA256 (owntracks-recorder-0.9.6_GH0.tar.gz) = 73bb2f6217a7c2aeabae4894f0b3499ce74f8d3b153c4ec3fa3b87358c3692fe
+SIZE (owntracks-recorder-0.9.6_GH0.tar.gz) = 3308976
diff --git a/www/ot-recorder/files/patch-config.mk.in b/www/ot-recorder/files/patch-config.mk.in
index 8b43ee7368c9..85aabb07a25e 100644
--- a/www/ot-recorder/files/patch-config.mk.in
+++ b/www/ot-recorder/files/patch-config.mk.in
@@ -1,49 +1,39 @@
---- config.mk.in.orig	2022-09-29 12:04:51 UTC
+--- config.mk.in.orig	2023-10-24 13:44:06 UTC
 +++ config.mk.in
-@@ -13,17 +13,19 @@
- #	$ cd /usr/ports/devel/libconfig; make install
- #	$ cd /usr/ports/net/mosquitto; make install
- #	$ cd /usr/ports/devel/gmake; make install
-+#	$ cd /usr/ports/devel/pkgconf; make install
-+#	$ cd /usr/ports/misc/e2fsprogs-libuuid; make install
- #
- # Or as a package:
- #
--#	$ sudo pkg install lmdb curl libconfig mosquitto gmake
-+#	$ sudo pkg install pkgconf lmdb curl libconfig mosquitto gmake e2fsprogs-libuuid
+@@ -22,10 +22,10 @@
  #
  # Uncomment the following lines and replace "no" with "yes":
  #
 -# CC      = clang
 -# CFLAGS += -I/usr/local/include
--# MORELIBS += -L /usr/local/lib
+-# MORELIBS += -L /usr/local/lib -luuid
 -FREEBSD ?= no
 +CC      = clang
 +CFLAGS += -I/usr/local/include
 +MORELIBS += -L /usr/local/lib -luuid
-+FREEBSD ?= YES
++FREEBSD ?= yes
  #
  # Now build recorder with the "gmake" command:
  #
-@@ -61,10 +63,10 @@ WITH_GREENWICH ?= no
+@@ -63,10 +63,10 @@ WITH_GREENWICH ?= no
  
  # Where should the recorder store its data? This directory must
  # exist and be writeable by recorder (and readable by ocat)
 -STORAGEDEFAULT = /var/spool/owntracks/recorder/store
 +STORAGEDEFAULT = /var/db/owntracks/recorder/store
  
  # Where should the recorder find its document root (HTTP)?
 -DOCROOT = /var/spool/owntracks/recorder/htdocs
 +DOCROOT = /usr/local/www/ot-recorder
  
  # Define the precision for reverse-geo lookups. The higher
  # the number, the more granular reverse-geo will be:
-@@ -87,7 +89,7 @@ GHASHPREC = 7
+@@ -89,7 +89,7 @@ GHASHPREC = 7
  JSON_INDENT ?= no
  
  # Location of optional default configuration file
 -CONFIGFILE = /etc/default/ot-recorder
 +CONFIGFILE = /usr/local/etc/ot-recorder/ot-recorder.conf
  
  # Optionally specify the path to the Mosquitto libs, include here
  MOSQUITTO_CFLAGS = `$(PKG_CONFIG) --cflags libmosquitto`
diff --git a/www/ot-recorder/files/patch-etc_ot-recorder.default b/www/ot-recorder/files/patch-etc_ot-recorder.default
new file mode 100644
index 000000000000..ea5eff11a905
--- /dev/null
+++ b/www/ot-recorder/files/patch-etc_ot-recorder.default
@@ -0,0 +1,11 @@
+--- etc/ot-recorder.default.orig	2023-10-25 15:22:53 UTC
++++ etc/ot-recorder.default
+@@ -9,7 +9,7 @@
+ # Storage directory
+ #
+ 
+-# OTR_STORAGEDIR="/var/spool/owntracks/recorder/store"
++# OTR_STORAGEDIR="/var/db/owntracks/recorder/store"
+ 
+ # -----------------------------------------------------
+ # Address or hostname of the MQTT broker