diff --git a/OpenWRT/Makefile b/OpenWRT/Makefile
index 724bb31..6414262 100644
--- a/OpenWRT/Makefile
+++ b/OpenWRT/Makefile
@@ -1,7 +1,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=cronosagent
-PKG_VERSION:=master
+PKG_VERSION:=$(shell grep -o -E '[0-9]+' source/Version.h)
 PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(PKG_VERSION)
 PKG_BUILD_DEPENDS:=+libstdcpp +libopenssl
 X_SOURCE_DIR:=$(CURDIR)/source
@@ -53,8 +53,8 @@ define Package/cronosagent/install
 	$(INSTALL_DIR) $(1)/etc/config
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/controller
 	$(INSTALL_DIR) $(1)/usr/lib/lua/luci/model/cbi/cronosagent
-	$(INSTALL_BIN) $(X_SOURCE_DIR)/cronosagent.sh $(1)/opt/CronosAgent/
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/cronosagent $(1)/opt/CronosAgent/
+	$(INSTALL_BIN) $(X_SOURCE_DIR)/cronosagent.sh $(1)/opt/CronosAgent/
 	$(INSTALL_BIN) $(X_SOURCE_DIR)/OpenWRT/init.d/cronosagent $(1)/etc/init.d/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/config/cronosagent $(1)/etc/config/
 	$(INSTALL_DATA) $(X_SOURCE_DIR)/OpenWRT/controller/cronosagent.lua $(1)/usr/lib/lua/luci/controller/
diff --git a/OpenWRT/build.sh b/OpenWRT/build.sh
index 861ca51..42d02f9 100755
--- a/OpenWRT/build.sh
+++ b/OpenWRT/build.sh
@@ -42,6 +42,6 @@ fi
 make package/$PACKAGE/compile V=99 2>&1 | tee $PROJECT/../build.log | grep -i error
 
 # Copy built packages
-find bin -name ${PACKAGE}*.ipk | xargs -I {} cp {} $PROJECT/.. 
+find bin -name ${PACKAGE}*.ipk | xargs -I {} mv {} $PROJECT/.. 
 
 popd > /dev/null