diff --git a/package/Makefile.linux b/package/Makefile.linux
index fba2ef3ff..78e902d71 100644
--- a/package/Makefile.linux
+++ b/package/Makefile.linux
@@ -49,7 +49,7 @@ linux_deb_package: deb_build gcs
 
 deb_build: | $(DEB_BUILD_DIR) $(ALL_DEB_FILES) $(BUILD_DIR)/build 
 	@echo $@ starting
-	$(V1)$(shell echo $(PACKAGE_DIR) > $(BUILD_DIR)/package_dir)
+	$(V1)$(shell echo $(FW_DIR) > $(BUILD_DIR)/package_dir)
 	$(V1)sed -i -e "$(SED_SCRIPT)" $(DEB_BUILD_DIR)/changelog
 
 $(BUILD_DIR)/build: package_flight
diff --git a/package/linux/deb_common/rules b/package/linux/deb_common/rules
old mode 100755
new mode 100644
index c4a7d9bd9..ba22c1e9c
--- a/package/linux/deb_common/rules
+++ b/package/linux/deb_common/rules
@@ -43,8 +43,10 @@ install:
 	cp -arp package/linux/openpilot_menu.png  debian/openpilot/usr/share/pixmaps
 	cp -arp package/linux/openpilot_menu.menu debian/openpilot/etc/xdg/menus/applications-merged
 	cp -arp package/linux/openpilot_menu.directory debian/openpilot/usr/share/desktop-directories
-ifdef $(PACKAGE_DIR)
-	cp -ar $(PACKAGE_DIR)/* debian/openpilot/usr/local/OpenPilot/firmware/
+ifdef PACKAGE_DIR
+	cp -a $(PACKAGE_DIR)/*.opfw debian/openpilot/usr/local/OpenPilot/firmware/
+else
+	$(error PACKAGE_DIR not defined! $(PACKAGE_DIR))
 endif
 	ln -s /usr/local/OpenPilot/bin/openpilotgcs.bin `pwd`/debian/openpilot/usr/bin/openpilot-gcs
 	rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/sounds/sounds