diff --git a/gluon/gluon-location/Makefile b/gluon/gluon-location/Makefile
new file mode 100644
index 0000000..d9cdf3e
--- /dev/null
+++ b/gluon/gluon-location/Makefile
@@ -0,0 +1,36 @@
+include $(TOPDIR)/rules.mk
+
+PKG_NAME:=gluon-location
+PKG_VERSION:=1
+PKG_location:=1
+
+PKG_BUILD_DIR := $(BUILD_DIR)/$(PKG_NAME)
+
+include $(INCLUDE_DIR)/package.mk
+
+define Package/gluon-location
+  SECTION:=gluon
+  CATEGORY:=Gluon
+  TITLE:=Add system.location to uci
+  DEPENDS:=+gluon-core
+endef
+
+define Package/gluon-location/description
+	This packages creates /lib/gluon/location.
+endef
+
+define Build/Prepare
+	mkdir -p $(PKG_BUILD_DIR)
+endef
+
+define Build/Configure
+endef
+
+define Build/Compile
+endef
+
+define Package/gluon-location/install
+	$(CP) ./files/* $(1)/
+endef
+
+$(eval $(call BuildPackage,gluon-location))
diff --git a/gluon/gluon-location/files/lib/gluon/upgrade/location/initial/010-location b/gluon/gluon-location/files/lib/gluon/upgrade/location/initial/010-location
new file mode 100755
index 0000000..9a2696d
--- /dev/null
+++ b/gluon/gluon-location/files/lib/gluon/upgrade/location/initial/010-location
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+CFG="@system[0]"
+
+uci -q batch <<EOF
+
+set system.${CFG}.share_location=0
+set system.${CFG}.latitude=0
+set system.${CFG}.longitude=0
+
+commit system
+EOF