diff --git a/scripts/build-common b/scripts/build-common
index 75632c7..d78469f 100644
--- a/scripts/build-common
+++ b/scripts/build-common
@@ -117,3 +117,35 @@ list_build_files() {
     find ./arch/${SRCARCH} -name module.lds -o -name Kbuild.platforms -o -name Platform
     find . -name Module.symvers -type f
 }
+
+create_firmware_tar() {
+    local list=$1
+    local temp=firmware-temp
+    rm -rf $temp
+    mkdir -p $temp
+    tar xf linux*.tar -C $temp
+
+    if [ ! -e linux-firmware ]; then
+        git clone git://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git
+    fi
+
+    (
+        cd linux-firmware
+        git rev-parse HEAD > .git-commit
+    )
+
+    echo .git-commit > files
+
+    for i in $(<$list); do
+        if [ ! -e $temp/lib/firmware/$i ]; then
+            if [ -e linux-firmware/$i ]; then
+                echo Found $i
+                echo $i >> files
+            else
+                echo Not found $i
+            fi
+        fi
+    done
+
+    tar cf firmware.tar --transform 's,^,lib/firmware/,' -C linux-firmware $(<files)
+}
diff --git a/scripts/build-kernel b/scripts/build-kernel
index ed3872d..e5f3068 100755
--- a/scripts/build-kernel
+++ b/scripts/build-kernel
@@ -10,6 +10,7 @@ export CC="ccache gcc"
 export PATH="/usr/lib/ccache:$PATH"
 KERNEL=$(basename ${KERNEL_URL})
 DIR=${KERNEL/.tar.*//}
+FIRMWARE=$(readlink -f scripts/firmware)
 
 mkdir -p ${BUILD}
 cd ${BUILD}
@@ -31,9 +32,11 @@ cp ${CONFIG}/kernel-config .config
 make oldconfig
 make -j$(nproc) tar-pkg
 
-list_build_files | tar -czf build.tar.gz -T /dev/stdin
+create_firmware_tar $FIRMWARE
 
 mkdir -p ${DIST}/kernel
-mv linux*.tar ${DIST}/kernel
-gzip ${DIST}/kernel/linux*.tar
-mv build.tar.gz ${DIST}/kernel
+
+FILE=$(echo linux*.tar)
+tar --concatenate --file=${FILE} firmware.tar
+cat $FILE | gzip -c > ${DIST}/kernel/${FILE}.gz
+list_build_files | tar -czf ${DIST}/kernel/build.tar.gz -T /dev/stdin
diff --git a/scripts/firmware b/scripts/firmware
new file mode 100644
index 0000000..003b9ee
--- /dev/null
+++ b/scripts/firmware
@@ -0,0 +1,58 @@
+ctfw-3.2.5.1.bin
+ql2400_fw.bin
+myri10ge_rss_eth_z8e.dat
+cxgb4/t4fw-1.12.25.0.bin
+cxgb4/t5fw-1.12.25.0.bin
+phanfw.bin
+isci/isci_firmware.bin
+ql2100_fw.bin
+ql2200_fw.bin
+bnx2/bnx2-rv2p-09ax-6.0.17.fw
+bnx2/bnx2-mips-09-6.2.1b.fw
+bnx2/bnx2-mips-06-6.2.3.fw
+bnx2/bnx2-rv2p-09-6.0.17.fw
+bnx2/bnx2-rv2p-06-6.0.15.fw
+myri10ge_rss_ethp_z8e.dat
+ql2500_fw.bin
+ct2fw-3.2.5.1.bin
+ql2300_fw.bin
+rtl_nic/rtl8168f-2.fw
+rtl_nic/rtl8168e-3.fw
+rtl_nic/rtl8105e-1.fw
+rtl_nic/rtl8168e-2.fw
+rtl_nic/rtl8168h-2.fw
+rtl_nic/rtl8106e-2.fw
+rtl_nic/rtl8168d-1.fw
+rtl_nic/rtl8168h-1.fw
+rtl_nic/rtl8168g-2.fw
+rtl_nic/rtl8107e-2.fw
+rtl_nic/rtl8411-2.fw
+rtl_nic/rtl8107e-1.fw
+rtl_nic/rtl8106e-1.fw
+rtl_nic/rtl8411-1.fw
+rtl_nic/rtl8168d-2.fw
+rtl_nic/rtl8402-1.fw
+rtl_nic/rtl8168f-1.fw
+rtl_nic/rtl8168e-1.fw
+rtl_nic/rtl8168g-3.fw
+e100/d101s_ucode.bin
+e100/d101m_ucode.bin
+e100/d102e_ucode.bin
+myri10ge_eth_z8e.dat
+ql2322_fw.bin
+qlogic/sd7220.fw
+cxgb3/t3c_psram-1.1.0.bin
+cxgb3/ael2020_twx_edc.bin
+cxgb3/ael2005_twx_edc.bin
+cxgb3/t3fw-7.12.0.bin
+cxgb3/ael2005_opt_edc.bin
+cxgb3/t3b_psram-1.1.0.bin
+tigon/tg3_tso5.bin
+tigon/tg3_tso.bin
+tigon/tg3.bin
+acenic/tg1.bin
+acenic/tg2.bin
+myri10ge_ethp_z8e.dat
+bnx2x/bnx2x-e1-7.10.51.0.fw
+bnx2x/bnx2x-e2-7.10.51.0.fw
+bnx2x/bnx2x-e1h-7.10.51.0.fw