diff --git a/config/external/moz.build b/config/external/moz.build
index 488ace3a8b16..2a197c4c2a0d 100644
--- a/config/external/moz.build
+++ b/config/external/moz.build
@@ -21,6 +21,8 @@ if CONFIG['MOZ_UPDATER']:
 external_dirs += ['modules/brotli']
 external_dirs += ['modules/woff2']
 
+external_dirs += ['modules/xz-embedded']
+
 if CONFIG['MOZ_VORBIS']:
     external_dirs += ['media/libvorbis']
 
@@ -64,7 +66,4 @@ external_dirs += [
     'media/psshparser'
 ]
 
-if CONFIG['MOZ_LINKER']:
-    external_dirs += ['modules/xz-embedded']
-
 DIRS += ['../../' + i for i in external_dirs]
diff --git a/modules/xz-embedded/moz.build b/modules/xz-embedded/moz.build
index ead99086ec90..2c061044eda5 100644
--- a/modules/xz-embedded/moz.build
+++ b/modules/xz-embedded/moz.build
@@ -33,4 +33,7 @@ elif '86' in CONFIG['TARGET_CPU']:
 
 DEFINES['XZ_USE_CRC64'] = 1
 
+if CONFIG['OS_ARCH'] == 'WINNT':
+    USE_STATIC_LIBS = True
+
 Library('xz-embedded')