diff --git a/uci-diff/Makefile b/uci-diff/Makefile
new file mode 100644
index 000000000..2bd0acaf7
--- /dev/null
+++ b/uci-diff/Makefile
@@ -0,0 +1,40 @@
+#
+# Copyright (C) 2016 Inteno
+#
+
+include $(TOPDIR)/rules.mk
+include $(INCLUDE_DIR)/kernel.mk
+
+PKG_NAME:=uci-diff
+PKG_VERSION:=1
+
+PKG_SOURCE_VERSION:=92988d82483e8b8ca09e6207e9aba85bda71cc18
+PKG_SOURCE_PROTO:=git
+PKG_SOURCE_URL:=git@private.inteno.se:uci-diff
+
+PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
+PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
+
+include $(INCLUDE_DIR)/package.mk
+
+LDFLAGS+= \
+	-Wl,-rpath-link=$(STAGING_DIR)/usr/lib \
+	-Wl,-rpath-link=$(STAGING_DIR)/lib
+
+define Package/uci-diff
+	CATEGORY:=Utilities
+	DEPENDS:=+libuci +libubox +ubus +ljson-c +lblobmsg_json
+	TITLE:=uci-diff
+endef
+
+define Package/uci-diff/description
+	uci-diff
+endef
+
+define Package/uci-diff/install
+	$(CP) ./files/* $(1)/
+	$(INSTALL_DIR) $(1)/sbin
+endef
+
+$(eval $(call BuildPackage,uci-diff))
diff --git a/uci-diff/files/etc/uci-diff/default/wireless b/uci-diff/files/etc/uci-diff/default/wireless
new file mode 100644
index 000000000..d00609c63
--- /dev/null
+++ b/uci-diff/files/etc/uci-diff/default/wireless
@@ -0,0 +1,43 @@
+{"wireless": {
+    "wifi-device": {
+        "type": "broadcom",
+        "country": "EU/13",
+        "band": "a",
+        "bandwidth": "80",
+        "hwmode": "11ac",
+        "channel": "auto",
+        "scantimer": "0",
+        "wmm": "1",
+        "wmm_noack": "0",
+        "wmm_apsd": "1",
+        "txpower": "100",
+        "rateset": "default",
+        "frag": "2346",
+        "rts": "2347",
+        "dtim_period": "1",
+        "beacon_int": "100",
+        "rxchainps": "0",
+        "rxchainps_qt": "10",
+        "rxchainps_pps": "10",
+        "rifs": "0",
+        "rifs_advert": "0",
+        "maxassoc": "32",
+        "doth": "1",
+        "dfsc": "1",
+        "disabled": "1"
+    },
+    "wifi-iface": {
+        "device": "wl0",
+        "network": "lan",
+        "mode": "ap",
+        "ssid": "Inteno-4BC8",
+        "encryption": "mixed-psk",
+        "cipher": "auto",
+        "key": "1234567890",
+        "gtk_rekey": "3600",
+        "macfilter": "0",
+        "wps_pbc": "1",
+        "wmf_bss_enable": "1",
+        "bss_max": "16"
+    }
+}}
diff --git a/uci-diff/files/etc/uci-diff/inteno/wireless b/uci-diff/files/etc/uci-diff/inteno/wireless
new file mode 100644
index 000000000..97cb6e73b
--- /dev/null
+++ b/uci-diff/files/etc/uci-diff/inteno/wireless
@@ -0,0 +1,22 @@
+{"wireless": {
+    "wl0": {
+        ".name": "wl0",
+        ".type": "wifi-device",
+        "channel": 100
+    },
+    "wl1": {
+        ".name": "wl1",
+        ".type": "wifi-device",
+        "wmm": 0
+    },
+    "wi0-0": {
+        ".type": "wifi-iface",
+        "device": "wi0-0",
+        "ssid": "Fredrik"
+    },
+    "wi1-0": {
+        ".type": "wifi-iface",
+        "device": "wi1-0",
+        "ssid": "blah"
+    }
+}}