diff --git a/Makefile b/Makefile
index a2d3d10f7..45cc25dd8 100644
--- a/Makefile
+++ b/Makefile
@@ -808,24 +808,10 @@ ifneq ($(strip $(filter package clean_package,$(MAKECMDGOALS))),)
     endif
 endif
 
-# Copy file template. Empty line before the endef is required, do not remove
-# $(1) = copy file name without extension
-# $(2) = source file extension
-# $(3) = destination file extension
-define COPY_FW_FILES
-	$(V1) $(CP) "$(BUILD_DIR)/$(1)/$(1)$(2)" "$(PACKAGE_DIR)/firmware/$(1)$(PACKAGE_SEP)$(PACKAGE_LBL)$(3)"
-
-endef
-
-# Build and copy package files into the package directory
-# and call platform-specific packaging script
 .PHONY: package
 package: all_fw all_ground uavobjects_matlab
 	@$(ECHO) "Packaging for $(UNAME) $(ARCH) into $(call toprel, $(PACKAGE_DIR)) directory"
 	$(V1) [ ! -d "$(PACKAGE_DIR)" ] || $(RM) -rf "$(PACKAGE_DIR)"
-	$(V1) $(MKDIR) -p "$(PACKAGE_DIR)/firmware"
-	$(foreach fw_targ, $(PACKAGE_FW_TARGETS), $(call COPY_FW_FILES,$(fw_targ),.opfw,.opfw))
-	$(foreach fw_targ, $(PACKAGE_ELF_TARGETS), $(call COPY_FW_FILES,$(fw_targ),.elf,.elf))
 	$(MAKE) --no-print-directory -C $(ROOT_DIR)/package --file=$(UNAME).mk $@
 
 ##############################
diff --git a/package/Darwin.mk b/package/Darwin.mk
index 1ada9f4c2..eb6cbe373 100644
--- a/package/Darwin.mk
+++ b/package/Darwin.mk
@@ -6,8 +6,6 @@ ifndef OPENPILOT_IS_COOL
     $(error Top level Makefile must be used to build this target)
 endif
 
-FW_DIR := $(PACKAGE_DIR)/firmware
-
 .PHONY: package
 package:
 	( \
@@ -17,6 +15,5 @@ package:
 	  PACKAGE_DIR="$(PACKAGE_DIR)" \
 	  PACKAGE_NAME="$(PACKAGE_NAME)" \
 	  PACKAGE_SEP="$(PACKAGE_SEP)" \
-	  FW_DIR="$(FW_DIR)" \
 	  "$(ROOT_DIR)/package/osx/package" \
 	)
diff --git a/package/Linux.mk b/package/Linux.mk
index 66d3c284e..59145265a 100644
--- a/package/Linux.mk
+++ b/package/Linux.mk
@@ -6,8 +6,6 @@ ifndef OPENPILOT_IS_COOL
     $(error Top level Makefile must be used to build this target)
 endif
 
-FW_DIR := $(PACKAGE_DIR)/firmware
-
 # Update this number for every formal release.  The Deb packaging system relies on this to know to update a
 # package or not.  Otherwise, the user has to uninstall first.
 # Until we do that, package name does NOT include $(VERNUM) and uses $(PACKAGE_LBL) only
@@ -44,7 +42,6 @@ ALL_DEB_FILES += $(foreach f, $(DEB_MACHINE_FILES), $(DEB_BUILD_DIR)/$(f))
 package: $(ALL_DEB_FILES)
 	$(V1) echo "Building Linux package, please wait..."
 	$(V1) mkdir -p $(DEB_BUILD_DIR)
-	$(V1)$(shell echo $(FW_DIR) > $(BUILD_DIR)/package_dir)
 	$(V1)sed -i -e "$(SED_SCRIPT)" $(DEB_BUILD_DIR)/changelog
 	$(V1) cd .. && dpkg-buildpackage -b -us -uc
 	$(V1) mv $(ROOT_DIR)/../$(DEB_PACKAGE_NAME).deb $(BUILD_DIR)/$(FULL_PACKAGE_NAME).deb
diff --git a/package/Windows.mk b/package/Windows.mk
index ea474d5c5..76227d15b 100644
--- a/package/Windows.mk
+++ b/package/Windows.mk
@@ -7,7 +7,6 @@ ifndef OPENPILOT_IS_COOL
 endif
 
 VERSION_CMD   := $(VERSION_INFO)
-FW_DIR        := $(PACKAGE_DIR)/firmware
 
 NSIS_OPTS     := /V3
 NSIS_WINX86   := $(ROOT_DIR)/package/winx86
diff --git a/package/linux/deb_common/rules b/package/linux/deb_common/rules
index 0977cdeed..eed06d551 100644
--- a/package/linux/deb_common/rules
+++ b/package/linux/deb_common/rules
@@ -19,8 +19,6 @@ export DH_OPTIONS=-v
 #%:
 #	dh $@ 
 
-PACKAGE_DIR	= $(shell cat build/package_dir)
-
 clean:
 	dh_testdir
 	dh_testroot
@@ -42,11 +40,6 @@ 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 -a $(PACKAGE_DIR)/*.elf debian/openpilot/usr/local/OpenPilot/firmware/
-else
-	$(error PACKAGE_DIR not defined! $(PACKAGE_DIR))
-endif
 	ln -s /usr/local/OpenPilot/bin/openpilotgcs `pwd`/debian/openpilot/usr/bin/openpilotgcs
 	rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/sounds/sounds
 	rm -rf debian/openpilot/usr/local/OpenPilot/share/openpilotgcs/pfd/pfd
diff --git a/package/osx/package b/package/osx/package
index bff3c4b6c..87cfea241 100755
--- a/package/osx/package
+++ b/package/osx/package
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 # the following environment variables must be set
-: ${ROOT_DIR?} ${BUILD_DIR?} ${PACKAGE_LBL?} ${PACKAGE_DIR?} ${FW_DIR?} ${PACKAGE_NAME?} ${PACKAGE_SEP?}
+: ${ROOT_DIR?} ${BUILD_DIR?} ${PACKAGE_LBL?} ${PACKAGE_DIR?} ${PACKAGE_NAME?} ${PACKAGE_SEP?}
 
 # more variables
 APP_PATH="${BUILD_DIR}/openpilotgcs_release/bin/OpenPilot GCS.app"
@@ -39,7 +39,6 @@ fi
 # packaging goes here
 cp -a "${APP_PATH}" "/Volumes/${mountvolume}"
 
-#ls "${FW_DIR}" | xargs -n 1 -I {} cp "${FW_DIR}/{}" "/Volumes/${VOL_NAME}/Firmware"
 cp "${BUILD_DIR}/uavobject-synthetics/matlab/OPLogConvert.m" "/Volumes/${mountvolume}/Utilities"
 cp "${ROOT_DIR}/WHATSNEW.txt" "/Volumes/${mountvolume}"
 cp "${ROOT_DIR}/README.txt" "/Volumes/${mountvolume}/Docs"
diff --git a/package/winx86/openpilotgcs.nsi b/package/winx86/openpilotgcs.nsi
index 654308576..ab8534742 100644
--- a/package/winx86/openpilotgcs.nsi
+++ b/package/winx86/openpilotgcs.nsi
@@ -57,7 +57,6 @@
 ; !define PACKAGE_LBL "${DATE}-${TAG_OR_HASH8}"
 ; !define PACKAGE_DIR "..\..\build\package-$${PACKAGE_LBL}"
 ; !define OUT_FILE "OpenPilotGCS-$${PACKAGE_LBL}-install.exe"
-; !define FIRMWARE_DIR "firmware-$${PACKAGE_LBL}"
 ; !define PRODUCT_VERSION "0.0.0.0"
 ; !define FILE_VERSION "${TAG_OR_BRANCH}:${HASH8} ${DATETIME}"
 ; !define BUILD_DESCRIPTION "${TAG_OR_BRANCH}:${HASH8} built from ${ORIGIN}, committed ${DATETIME} as ${HASH}"
@@ -225,12 +224,6 @@ Section "-Localization" InSecLocalization
   File /r "${GCS_BUILD_TREE}\share\openpilotgcs\translations\qt_*.qm"
 SectionEnd
 
-; Copy firmware files
-Section /o "-Firmware" InSecFirmware
-  SetOutPath "$INSTDIR\firmware"
-  File /r "${PACKAGE_DIR}\${FIRMWARE_DIR}\*"
-SectionEnd
-
 ; Copy utility files
 Section "-Utilities" InSecUtilities
   SetOutPath "$INSTDIR\utilities"