--- a/toolkit/mozapps/installer/upload-files.mk
+++ b/toolkit/mozapps/installer/upload-files.mk
@@ -59,33 +59,34 @@ endif
 
 # JavaScript Shell packaging
 JSSHELL_BINS  = \
   js$(BIN_SUFFIX) \
   $(DLL_PREFIX)mozglue$(DLL_SUFFIX) \
   $(NULL)
 
 ifndef MOZ_SYSTEM_NSPR
-  ifdef MSVC_C_RUNTIME_DLL
-    JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
-  endif
-  ifdef MSVC_CXX_RUNTIME_DLL
-    JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
-  endif
   ifdef MOZ_FOLD_LIBS
     JSSHELL_BINS += $(DLL_PREFIX)nss3$(DLL_SUFFIX)
   else
     JSSHELL_BINS += \
       $(DLL_PREFIX)nspr4$(DLL_SUFFIX) \
       $(DLL_PREFIX)plds4$(DLL_SUFFIX) \
       $(DLL_PREFIX)plc4$(DLL_SUFFIX) \
       $(NULL)
   endif # MOZ_FOLD_LIBS
 endif # MOZ_SYSTEM_NSPR
 
+ifdef MSVC_C_RUNTIME_DLL
+  JSSHELL_BINS += $(MSVC_C_RUNTIME_DLL)
+endif
+ifdef MSVC_CXX_RUNTIME_DLL
+  JSSHELL_BINS += $(MSVC_CXX_RUNTIME_DLL)
+endif
+
 ifdef MOZ_SHARED_ICU
 ifeq ($(OS_TARGET), WINNT)
 JSSHELL_BINS += \
   icudt$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   icuin$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   icuuc$(MOZ_ICU_DBG_SUFFIX)$(MOZ_ICU_VERSION).dll \
   $(NULL)
 else