diff --git a/general/package/mavfwd/mavfwd.mk b/general/package/mavfwd/mavfwd.mk
index f01228ec..eb380472 100644
--- a/general/package/mavfwd/mavfwd.mk
+++ b/general/package/mavfwd/mavfwd.mk
@@ -4,9 +4,8 @@
 #
 ################################################################################
 
-MAVFWD_SITE_METHOD = git
-MAVFWD_SITE = https://github.com/openipc/mavfwd
-MAVFWD_VERSION = 70da7adbdbe36d371ca849c4a3bc3cadb54498d3
+MAVFWD_SITE = $(call github,openipc,mavfwd,$(MAVFWD_VERSION))
+MAVFWD_VERSION = HEAD
 
 MAVFWD_LICENSE = MIT
 MAVFWD_LICENSE_FILES = LICENSE
@@ -14,15 +13,15 @@ MAVFWD_LICENSE_FILES = LICENSE
 MAVFWD_DEPENDENCIES = libevent-openipc
 
 define MAVFWD_BUILD_CMDS
-    (cd $(@D); $(TARGET_CC) -levent_core -s mavfwd.c -o mavfwd)
+	$(TARGET_CC) $(@D)/mavfwd.c -o $(@D)/mavfwd -levent_core -s
 endef
 
 define MAVFWD_INSTALL_TARGET_CMDS
-    $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
-    $(INSTALL) -m 0755 -D $(@D)/mavfwd $(TARGET_DIR)/usr/bin/mavfwd
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/bin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/bin $(@D)/mavfwd
 
-    $(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
-    cp $(MAVFWD_PKGDIR)/files/channels.sh $(TARGET_DIR)/usr/sbin
+	$(INSTALL) -m 755 -d $(TARGET_DIR)/usr/sbin
+	$(INSTALL) -m 755 -t $(TARGET_DIR)/usr/sbin $(MAVFWD_PKGDIR)/files/channels.sh
 endef
 
 $(eval $(generic-package))