diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index a1b8018..842e556 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -112,3 +112,4 @@
 BR2_PACKAGE_GAMMARUS=y
 BR2_PACKAGE_LLDP_SYSTEMD_NETWORKD_SYSREPO=y
 BR2_PACKAGE_VELIA=y
+BR2_PACKAGE_RESET_SYSREPO=y
diff --git a/package/Config.in b/package/Config.in
index d09116f..4d73ced 100644
--- a/package/Config.in
+++ b/package/Config.in
@@ -7,3 +7,4 @@
 source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/lldp-systemd-networkd-sysrepo/Config.in"
 source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/velia/Config.in"
 source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/grub2-tools/Config.in"
+source "$BR2_EXTERNAL_CZECHLIGHT_PATH/package/reset-sysrepo/Config.in"
diff --git a/package/reset-sysrepo/Config.in b/package/reset-sysrepo/Config.in
new file mode 100644
index 0000000..726c932
--- /dev/null
+++ b/package/reset-sysrepo/Config.in
@@ -0,0 +1,6 @@
+config BR2_PACKAGE_RESET_SYSREPO
+	bool "Override and re-init sysrepo's /dev/shm"
+	help
+	  If enabled, configure sysrepo to use /run/sysrepo instead of
+	  /dev/shm, and reinitialize that filesystem with a fresh tmpfs upon
+	  restart of any sysrepo-using service.
diff --git a/package/reset-sysrepo/reset-sysrepo.mk b/package/reset-sysrepo/reset-sysrepo.mk
new file mode 100644
index 0000000..3b56fd8
--- /dev/null
+++ b/package/reset-sysrepo/reset-sysrepo.mk
@@ -0,0 +1,36 @@
+RESET_SYSREPO_INSTALL_TARGET = YES
+
+define RESET_SYSREPO_PATCH_DEV_SHM
+        sed -i \
+                's|^#define SR_SHM_DIR .*|#define SR_SHM_DIR "/run/sysrepo"|' \
+                $(@D)/src/common.h.in
+endef
+
+SYSREPO_PRE_PATCH_HOOKS += RESET_SYSREPO_PATCH_DEV_SHM
+SYSREPO_POST_RSYNC_HOOKS += RESET_SYSREPO_PATCH_DEV_SHM
+
+define RESET_SYSREPO_INSTALL_TARGET_CMDS
+	$(INSTALL) -D -m 0644 \
+		--target-directory $(TARGET_DIR)/usr/lib/systemd/system/ \
+		$(BR2_EXTERNAL_CZECHLIGHT_PATH)/package/reset-sysrepo/run-sysrepo.mount
+	$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/systemd/system/run-sysrepo.mount.d/
+	for UNIT in \
+		cla-sdn-inline.service \
+		cla-sdn-roadm-add-drop.service \
+		cla-sdn-roadm-coherent-a-d.service \
+		cla-sdn-roadm-line.service \
+		lldp-systemd-networkd-sysrepo.service \
+		netopeer2.service \
+		sysrepo-persistent-cfg.service \
+		velia.service \
+	; do \
+		echo "Adding systemd drop-ins $${UNIT} <-> /run/sysrepo"; \
+		$(INSTALL) -d -m 0755 $(TARGET_DIR)/usr/lib/systemd/system/$${UNIT}.d/ ; \
+		echo -e "[Unit]\nBindsTo=run-sysrepo.mount\nAfter=run-sysrepo.mount\nPartOf=run-sysrepo.mount" \
+			> $(TARGET_DIR)/usr/lib/systemd/system/$${UNIT}.d/reset-sysrepo.conf ; \
+		echo -e "[Unit]\nPartOf=$${UNIT}" \
+			> $(TARGET_DIR)/usr/lib/systemd/system/run-sysrepo.mount.d/$${UNIT}.conf ; \
+	done
+endef
+
+$(eval $(generic-package))
diff --git a/package/reset-sysrepo/run-sysrepo.mount b/package/reset-sysrepo/run-sysrepo.mount
new file mode 100644
index 0000000..26f5a84
--- /dev/null
+++ b/package/reset-sysrepo/run-sysrepo.mount
@@ -0,0 +1,9 @@
+[Unit]
+Description=Prepare a fake /dev/shm for sysrepo
+Before=netopeer2-install-yang.service czechlight-install-yang.service netopeer2-setup.service
+
+[Mount]
+What=tmpfs
+Where=/run/sysrepo
+Type=tmpfs
+DirectoryMode=0000