diff --git a/ground/openpilotgcs/src/plugins/uploader/uploader.pro b/ground/openpilotgcs/src/plugins/uploader/uploader.pro
index 05742868d..90b8fa9ea 100755
--- a/ground/openpilotgcs/src/plugins/uploader/uploader.pro
+++ b/ground/openpilotgcs/src/plugins/uploader/uploader.pro
@@ -45,3 +45,6 @@ FORMS += \
 
 RESOURCES += \
     uploader.qrc
+exists( ../../../../build/ground/opfw_resource/opfw_resource.qrc ) {
+     \ ../../../../build/ground/opfw_resource/opfw_resource.qrc
+}
diff --git a/package/Makefile b/package/Makefile
index 88a8bb1c4..1529e1e66 100644
--- a/package/Makefile
+++ b/package/Makefile
@@ -141,11 +141,9 @@ OPFW_CONTENTS := \
 .PHONY: opfw_resource
 opfw_resource:
 	@echo Generating OPFW resource file $(call toprel, $(BUILD_DIR)/ground/$@)
-	$(V1) mkdir -p $(BUILD_DIR)/ground/$@
+	$(V1) mkdir -p $(BUILD_DIR)/ground/$@
 	$(V1) mkdir -p $(BUILD_DIR)/ground/$@/build
-	$(V1) echo '$(OPFW_CONTENTS)' > $(BUILD_DIR)/ground/$@/opfw_resource.qrc
-	$(V1) $(foreach fw_targ, $(FW_TARGETS), mkdir -p $(BUILD_DIR)/ground/$@/build/$(fw_targ);)
-	$(V1)$(foreach fw_targ, $(FW_TARGETS), cp $(BUILD_DIR)/$(fw_targ)/$(fw_targ).opfw $(BUILD_DIR)/ground/$@/build/$(fw_targ)/;) 
-	$(V1) rcc -binary $(BUILD_DIR)/ground/$@/opfw_resource.qrc -o $(BUILD_DIR)/ground/$@/opfw_resource.rcc
-	$(V1) $(RM) -fr $(BUILD_DIR)/ground/$@/build
+	$(V1) echo '$(OPFW_CONTENTS)' > $(BUILD_DIR)/ground/$@/opfw_resource.qrc
+	$(V1) $(foreach fw_targ, $(FW_TARGETS), mkdir -p $(BUILD_DIR)/ground/$@/build/$(fw_targ);)
+	$(V1)$(foreach fw_targ, $(FW_TARGETS), cp $(BUILD_DIR)/$(fw_targ)/$(fw_targ).opfw $(BUILD_DIR)/ground/$@/build/$(fw_targ)/;)
 include $(WHEREAMI)/Makefile.$(PLATFORM)