diff --git a/UPDATING b/UPDATING
index 585a9dcf2787..9f052f5db13d 100644
--- a/UPDATING
+++ b/UPDATING
@@ -6,6 +6,20 @@ You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
 
+20190801:
+  AFFECTS: users of www/ot-recorder
+  AUTHOR: dvl@FreeBSD.org
+
+  The data directory has moved from /var/spool/owntracks to 
+  /var/db/owntracks
+
+  Be sure to stop otrecorder, move the directory, and start otrecorder.
+
+  service ot-recorder stop
+  cd /var/spool
+  mv owntracks /var/db
+  service ot-recorder start
+
 20190728:
   AFFECTS: users of net-im/py-matrix-synapse
   AUTHOR: kai@FreeBSD.org
diff --git a/www/ot-recorder/Makefile b/www/ot-recorder/Makefile
index 14460d5ae9b4..62c243d23dbb 100644
--- a/www/ot-recorder/Makefile
+++ b/www/ot-recorder/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ot-recorder
 PORTVERSION=	0.8.4
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 
 MAINTAINER=	dvl@FreeBSD.org
@@ -44,8 +44,9 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/etc/ot-recorder.default ${STAGEDIR}${ETCDIR}/ot-recorder.conf.sample
 
 	${MKDIR} ${STAGEDIR}/var/log/ot-recorder
-	${MKDIR} ${STAGEDIR}/var/spool/owntracks
-	${MKDIR} ${STAGEDIR}/var/spool/owntracks/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/
 
diff --git a/www/ot-recorder/files/patch-config.mk b/www/ot-recorder/files/patch-config.mk
index bb109ea4ae33..aa3a53adf45c 100644
--- a/www/ot-recorder/files/patch-config.mk
+++ b/www/ot-recorder/files/patch-config.mk
@@ -15,8 +15,12 @@
  #
  # Now build recorder with the "gmake" command:
  #
-@@ -60,7 +60,7 @@ WITH_GREENWICH ?= no
- STORAGEDEFAULT = /var/spool/owntracks/recorder/store
+@@ -57,10 +57,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
diff --git a/www/ot-recorder/pkg-plist b/www/ot-recorder/pkg-plist
index abc22d5c7c54..c5d052effe2a 100644
--- a/www/ot-recorder/pkg-plist
+++ b/www/ot-recorder/pkg-plist
@@ -1,4 +1,4 @@
-@sample(,,640) %%ETCDIR%%/ot-recorder.conf.sample
+@sample(,ot-recorder,640) %%ETCDIR%%/ot-recorder.conf.sample
 bin/ocat
 etc/rc.d/ot-recorder
 sbin/ot-recorder
@@ -300,5 +300,6 @@ sbin/ot-recorder
 @dir %%WWWDIR%%/table
 @dir %%WWWDIR%%/views
 @dir(ot-recorder,ot-recorder,) /var/log/ot-recorder
-@dir(ot-recorder,ot-recorder,) /var/spool/owntracks/recorder
-@dir /var/spool/owntracks
+@dir(ot-recorder,ot-recorder,) /var/run/ot-recorder
+@dir(ot-recorder,ot-recorder,750) /var/db/owntracks/recorder
+@dir /var/db/owntracks