diff --git a/.travis.yml b/.travis.yml
index 486abb2f29..a960f32a66 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -108,6 +108,7 @@ after_success:
   - if [[ "${TRAVIS_OS_NAME}" = "linux" && "${GCC_VER}" = "4.8" ]]; then
          make package_firmware
       && find . -name \*.px4 -exec cp "{}" . \;
+      && find . -maxdepth 1 -mindepth 1 -type f -name 'nuttx-*.px4' | sed 's/.\/nuttx-//' | xargs -I{} mv nuttx-{} {}
       && ./CI-Tools/s3cmd-put px4fmu-v1_default.px4 px4fmu-v2_default.px4 px4fmu-v2_lpe.px4 px4fmu-v4_default.px4 px4-stm32f4discovery-default.px4 build_px4fmu-v2_default/parameters.xml build_px4fmu-v2_default/airframes.xml CI-Tools/directory/index.html Firmware/$TRAVIS_BRANCH/
       && ./CI-Tools/s3cmd-put Firmware.zip archives/Firmware/$TRAVIS_BRANCH/$TRAVIS_BUILD_ID/
       && ./CI-Tools/s3cmd-put CI-Tools/directory/index.html archives/Firmware/$TRAVIS_BRANCH/