diff --git a/net/teddycloud/Makefile b/net/teddycloud/Makefile
index 0bcf24fe7813..0303c4384eda 100644
--- a/net/teddycloud/Makefile
+++ b/net/teddycloud/Makefile
@@ -1,80 +1,81 @@
 PORTNAME=	teddycloud
 DISTVERSIONPREFIX=	tc_v
 DISTVERSION=	0.6.4
+PORTREVISION=	1
 CATEGORIES=	net
 # Get the latest commit hashes here: https://github.com/toniebox-reverse-engineering/tonies-json/commits/release/
 # NOTE: remove the existing tonies.json and tonieboxes.json from DISTDIR before you do a `make makesum`
 MASTER_SITES=	https://raw.githubusercontent.com/toniebox-reverse-engineering/tonies-json/c874ca0c33eb929ee1c94983f53f3f8a55445c6b/:toniesjson
 DISTFILES=	tonies.json:toniesjson \
 		tonieboxes.json:toniesjson
 EXTRACT_ONLY=	${DISTFILES:N*\:toniesjson:C/\:.*//}
 
 MAINTAINER=	freebsd@pe82.de
 COMMENT=	Alternative cloud server for the Toniebox
 WWW=		https://tonies-wiki.revvox.de/docs/tools/teddycloud/
 
 LICENSE=	GPLv2+
 
 NOT_FOR_ARCHS=		armv6 armv7 i386 powerpc powerpcspe
 NOT_FOR_ARCHS_REASON=	32bit targets do not build due to type issues. Upstream library assumes FreeBSD to be 64bit.
 
 BUILD_DEPENDS+=	curl:ftp/curl \
 		protoc-c:devel/protobuf-c
 
 USES=		gmake
 USE_GCC=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	toniebox-reverse-engineering:DEFAULT,teddycloud_web \
 		DaveGamble:cJSON \
 		xiph:ogg,opus \
 		Oryx-Embedded:cyclone_common,cyclone_crypto,cyclone_ssl,cyclone_tcp
 GH_PROJECT=	cJSON:cJSON ogg:ogg opus:opus teddycloud_web:teddycloud_web \
 		Common:cyclone_common CycloneCRYPTO:cyclone_crypto \
 		CycloneSSL:cyclone_ssl CycloneTCP:cyclone_tcp
 GH_SUBDIR=	cJSON:cJSON ogg:ogg opus:opus teddycloud_web:teddycloud_web \
 		cyclone/common:cyclone_common cyclone/cyclone_crypto:cyclone_crypto \
 		cyclone/cyclone_ssl:cyclone_ssl cyclone/cyclone_tcp:cyclone_tcp
 # find versions here clone the repository and switch to tag
 # git submodule update
 # git submodule
 GH_TAGNAME=	v1.7.18:cJSON \
 		v1.3.5-9-gdb5c7a4:ogg \
 		v1.4-7-g101a71e0:opus \
 		tcw_v${DISTVERSION}:teddycloud_web \
 		v2.3.2:cyclone_common,cyclone_crypto,cyclone_ssl,cyclone_tcp
 
 USE_RC_SUBR=	teddycloudd
 MAKE_ENV+=	CONFIG_RUNTIME_BASE_PATH=${PREFIX}/etc/teddycloud \
 		RUNTIME_BASE_PATH=${PREFIX}/share/teddycloud \
 		NO_SANITIZERS=1 \
 		GIT_DIRTY=0 \
 		GIT_BUILD_TIME="2025-03-05 08:01:37 +0000" \
 		GIT_SHORT_SHA=f13703a \
 		GIT_SHA=f13703ad110b6c42f693d35b7ac211e487d37c83 \
 		GIT_TAG=tc_v${DISTVERSION} \
 		WEB_GIT_DIRTY=0 \
 		WEB_GIT_BUILD_TIME="2025-03-03 18:54:08 +0000" \
 		WEB_GIT_SHORT_SHA=d24276e \
 		WEB_GIT_SHA=d24276e8d0972477d988449c566879974795d02a \
 		WEB_GIT_TAG=tcw_v${DISTVERSION}
 # This did reliably fail due to some unknown deps when using parallel build
 MAKE_JOBS_UNSAFE=	yes
 ALL_TARGET=	preinstall
 
 post-extract:
 
 pre-install:
 	@${CP} ${DISTFILES:M*\:toniesjson:C/\:.*//:S,^,${_DISTDIR},} ${WRKSRC}/install/pre/config/
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/install/pre/teddycloud ${STAGEDIR}${PREFIX}/bin
 	@${MKDIR} ${STAGEDIR}${DATADIR}/certs
 	@(cd ${WRKSRC}/install/pre/certs && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/certs)
 	@${MKDIR} ${STAGEDIR}${DATADIR}/data
 	@(cd ${WRKSRC}/install/pre/data && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/data)
 	@${MKDIR} ${STAGEDIR}${DATADIR}/certs
 	@(cd ${WRKSRC}/install/pre/certs && ${COPYTREE_SHARE} . ${STAGEDIR}${DATADIR}/certs)
-	@${MKDIR} ${STAGEDIR}${PREFIX}/etc/teddycloud
-	@(cd ${WRKSRC}/install/pre/config && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/etc/teddycloud)
+	@${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
+	@(cd ${WRKSRC}/install/pre/config && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 
 .include <bsd.port.mk>
diff --git a/net/teddycloud/pkg-plist b/net/teddycloud/pkg-plist
index 7e462283ecea..4b357f18a1c3 100644
--- a/net/teddycloud/pkg-plist
+++ b/net/teddycloud/pkg-plist
@@ -1,84 +1,84 @@
 bin/teddycloud
-%%ETCDIR%%/tonieboxes.custom.json
-%%ETCDIR%%/tonieboxes.json
-%%ETCDIR%%/tonies.custom.json
-%%ETCDIR%%/tonies.json
+@sample %%EXAMPLESDIR%%/tonieboxes.custom.json %%ETCDIR%%/tonieboxes.custom.json
+@sample %%EXAMPLESDIR%%/tonieboxes.json %%ETCDIR%%/tonieboxes.json
+@sample %%EXAMPLESDIR%%/tonies.custom.json %%ETCDIR%%/tonies.custom.json
+@sample %%EXAMPLESDIR%%/tonies.json %%ETCDIR%%/tonies.json
 %%DATADIR%%/data/www/404.html
 %%DATADIR%%/data/www/encode_test.html
 %%DATADIR%%/data/www/favicon.ico
 %%DATADIR%%/data/www/img_custom.png
 %%DATADIR%%/data/www/img_empty.png
 %%DATADIR%%/data/www/img_unknown.png
 %%DATADIR%%/data/www/legacy.html
 %%DATADIR%%/data/www/library/babel.js
 %%DATADIR%%/data/www/library/esptool.js
 %%DATADIR%%/data/www/library/react-dom.development.js
 %%DATADIR%%/data/www/library/react.development.js
 %%DATADIR%%/data/www/robots.txt
 %%DATADIR%%/data/www/web/assets/01_CH341A_programmer_1-BWh6CFRm.png
 %%DATADIR%%/data/www/web/assets/01_CH341A_programmer_2-DLQkFrYM.png
 %%DATADIR%%/data/www/web/assets/02_CH341A_sop8_1-B7nvMxlQ.jpg
 %%DATADIR%%/data/www/web/assets/02_CH341A_sop8_2-CW3KfcCM.jpg
 %%DATADIR%%/data/www/web/assets/02_CH341A_sop8_3-B20tcrp3.jpg
 %%DATADIR%%/data/www/web/assets/02_CH341A_sop8_remove-D-uCy9Q0.jpg
 %%DATADIR%%/data/www/web/assets/3200_pcb-Dxz0Vi-z.png
 %%DATADIR%%/data/www/web/assets/3200_pcb_preview-BvQM-e4R.png
 %%DATADIR%%/data/www/web/assets/3235_pcb-BE0vs2bl.png
 %%DATADIR%%/data/www/web/assets/3235_pcb_preview-DkVKgZS0.png
 %%DATADIR%%/data/www/web/assets/cc3200-B-jSkbsy.jpg
 %%DATADIR%%/data/www/web/assets/cc3200_debugPort-CUfuhKbo.jpg
 %%DATADIR%%/data/www/web/assets/cc3200_installCfwFlashUpload-D3jB7q0q.png
 %%DATADIR%%/data/www/web/assets/cc3200_tagConnector-C5CJTEin.png
 %%DATADIR%%/data/www/web/assets/cc3200_wiresAsTagConnector-BuyL-dME.png
 %%DATADIR%%/data/www/web/assets/cc3235-Cr21bWbC.jpg
 %%DATADIR%%/data/www/web/assets/cc3235_flash-D2YMWv70.jpg
 %%DATADIR%%/data/www/web/assets/cc3235_smd_grippers-MdbEjaZo.jpg
 %%DATADIR%%/data/www/web/assets/esp32-BPYaDt9v.js
 %%DATADIR%%/data/www/web/assets/esp32-B_b6hCjy.jpg
 %%DATADIR%%/data/www/web/assets/esp32_pcb-CWEYHEzm.png
 %%DATADIR%%/data/www/web/assets/esp32_pcb_clamp-Cw2o3uco.png
 %%DATADIR%%/data/www/web/assets/esp32_pcb_preview-Bh1UGQPK.png
 %%DATADIR%%/data/www/web/assets/esp32_write_patched_image_with_esptools-DmsBlrjp.png
 %%DATADIR%%/data/www/web/assets/esp32c2-CVPL8n1g.js
 %%DATADIR%%/data/www/web/assets/esp32c3-I3vXmsVg.js
 %%DATADIR%%/data/www/web/assets/esp32c5-CAGCiNY4.js
 %%DATADIR%%/data/www/web/assets/esp32c6-C93uIFil.js
 %%DATADIR%%/data/www/web/assets/esp32c61-Qo5S0GG2.js
 %%DATADIR%%/data/www/web/assets/esp32h2-Cf8JbGZQ.js
 %%DATADIR%%/data/www/web/assets/esp32p4-DfBdIAkh.js
 %%DATADIR%%/data/www/web/assets/esp32s2-3nCAg6Ct.js
 %%DATADIR%%/data/www/web/assets/esp32s3-mu2zzjDN.js
 %%DATADIR%%/data/www/web/assets/esp8266-8VKmCx7J.js
 %%DATADIR%%/data/www/web/assets/index-DUW332vS.js
 %%DATADIR%%/data/www/web/assets/index-Dljhv4sL.css
 %%DATADIR%%/data/www/web/assets/logo-aw46LCqE.png
 %%DATADIR%%/data/www/web/assets/openTB_step1_1-4vwQGflo.png
 %%DATADIR%%/data/www/web/assets/openTB_step1_2-DIZc5DI4.png
 %%DATADIR%%/data/www/web/assets/openTB_step2-DhjDRq3m.png
 %%DATADIR%%/data/www/web/assets/openTB_step3-Dn6Mo3hQ.png
 %%DATADIR%%/data/www/web/assets/openTB_step4-Bj5i-Kw_.png
 %%DATADIR%%/data/www/web/assets/openTB_step5-DTGOEBgD.png
 %%DATADIR%%/data/www/web/assets/rom-Caghk6Eh.js
 %%DATADIR%%/data/www/web/assets/tb-esp32-uart-BDPWj6EB.png
 %%DATADIR%%/data/www/web/assets/tb-esp32-uart-clamp-D_86EMpu.png
 %%DATADIR%%/data/www/web/assets/uart_3v3-5V_jumper_black-BW2kS97B.jpg
 %%DATADIR%%/data/www/web/assets/uart_3v3-5V_jumper_switch-Cl7yHFlu.jpg
 %%DATADIR%%/data/www/web/assets/uart_3v3-5V_jumper_yellow-d4JFD7jo.jpg
 %%DATADIR%%/data/www/web/assets/unknown_box-xU178mnG.png
 %%DATADIR%%/data/www/web/favicon.ico
 %%DATADIR%%/data/www/web/index.html
 %%DATADIR%%/data/www/web/manifest.json
 %%DATADIR%%/data/www/web/robots.txt
 %%DATADIR%%/data/www/web/translations/de.json
 %%DATADIR%%/data/www/web/translations/en.json
 %%DATADIR%%/data/www/web/translations/es.json
 %%DATADIR%%/data/www/web/translations/fr.json
 %%DATADIR%%/data/www/web/web_version.json
 @dir %%DATADIR%%/certs/client
 @dir %%DATADIR%%/certs/server
 @dir %%DATADIR%%/data/content/default
 @dir %%DATADIR%%/data/firmware/ota/cc3200
 @dir %%DATADIR%%/data/firmware/ota/cc3235
 @dir %%DATADIR%%/data/firmware/ota/esp32
 @dir %%DATADIR%%/data/library
 @dir %%DATADIR%%/data/www/custom_img