diff --git a/extract-files.sh b/extract-files.sh
index 928297e..52826c9 100755
--- a/extract-files.sh
+++ b/extract-files.sh
@@ -25,6 +25,7 @@ source "${HELPER}"
 CLEAN_VENDOR=true
 
 ONLY_COMMON=
+ONLY_FIRMWARE=
 ONLY_TARGET=
 KANG=
 SECTION=
@@ -34,6 +35,9 @@ while [ "${#}" -gt 0 ]; do
         --only-common )
                 ONLY_COMMON=true
                 ;;
+        --only-firmware )
+                ONLY_FIRMWARE=true
+                ;;
         --only-target )
                 ONLY_TARGET=true
                 ;;
@@ -78,7 +82,7 @@ function blob_fixup() {
     esac
 }
 
-if [ -z "${ONLY_TARGET}" ]; then
+if [ -z "${ONLY_FIRMWARE}" ] && [ -z "${ONLY_TARGET}" ]; then
     # Initialize the helper for common device
     setup_vendor "${DEVICE_COMMON}" "${VENDOR}" "${ANDROID_ROOT}" true "${CLEAN_VENDOR}"
 
@@ -90,7 +94,9 @@ if [ -z "${ONLY_COMMON}" ] && [ -s "${MY_DIR}/../${DEVICE}/proprietary-files.txt
     source "${MY_DIR}/../${DEVICE}/extract-files.sh"
     setup_vendor "${DEVICE}" "${VENDOR}" "${ANDROID_ROOT}" false "${CLEAN_VENDOR}"
 
-    extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+    if [ -z "${ONLY_FIRMWARE}" ]; then
+        extract "${MY_DIR}/../${DEVICE}/proprietary-files.txt" "${SRC}" "${KANG}" --section "${SECTION}"
+    fi
 
     if [ -f "${MY_DIR}/../${DEVICE}/proprietary-firmware.txt" ]; then
         extract_firmware "${MY_DIR}/../${DEVICE}/proprietary-firmware.txt" "${SRC}"