diff --git a/Makefile b/Makefile
index 1a7f86b..8f6914a 100644
--- a/Makefile
+++ b/Makefile
@@ -23,6 +23,8 @@ define Package/nat6/install
 	$(INSTALL_BIN) ./files/60-luci-firewall-nat6 $(1)/etc/uci-defaults
 	$(INSTALL_DIR) $(1)/etc/init.d
 	$(INSTALL_BIN) ./files/nat6.init $(1)/etc/init.d/nat6
+	$(INSTALL_DIR) $(1)/usr/share/ucitrack
+	$(INSTALL_CONF) ./files/nat6.ucitrack $(1)/usr/share/ucitrack/nat6.json
 endef
 
 $(eval $(call BuildPackage,nat6))
diff --git a/files/60-luci-firewall-nat6 b/files/60-luci-firewall-nat6
index 1b2311a..e2ac22a 100644
--- a/files/60-luci-firewall-nat6
+++ b/files/60-luci-firewall-nat6
@@ -1,10 +1,12 @@
 #!/bin/sh
 
+[ -f "/etc/config/ucitrack" ] && {
 uci -q batch <<-EOF >/dev/null
 	delete ucitrack.@firewall[2]
 	add ucitrack firewall
 	set ucitrack.@firewall[2].init=nat6
 	commit ucitrack
 EOF
+}
 
-exit 0
\ No newline at end of file
+exit 0
diff --git a/files/nat6.ucitrack b/files/nat6.ucitrack
new file mode 100644
index 0000000..e8227ed
--- /dev/null
+++ b/files/nat6.ucitrack
@@ -0,0 +1,4 @@
+{
+	"config": "firewall",
+	"init": "nat6"
+}