diff --git a/security/build/Makefile.in b/security/build/Makefile.in
index 9ea1d1b0b52..b692ff79507 100644
--- a/security/build/Makefile.in
+++ b/security/build/Makefile.in
@@ -495,4 +495,4 @@ endif # MOZ_FOLD_LIBS
 
 # Work around NSS build system race condition creating certdata.c in
 # security/nss/lib/ckfw/builtins. See bug #836220.
-libs-nss/lib: $(call mkdir_deps,../nss/lib/ckfw/builtins)
+libs-nss/lib$(if $(MOZ_FOLD_LIBS),/ckfw): $(call mkdir_deps,../nss/lib/ckfw/builtins)