diff --git a/mozilla/security/manager/Makefile.in b/mozilla/security/manager/Makefile.in
index d728835500a..95b5f181fae 100644
--- a/mozilla/security/manager/Makefile.in
+++ b/mozilla/security/manager/Makefile.in
@@ -77,6 +77,14 @@ SUBMAKEFILES = boot/Makefile ssl/Makefile pki/Makefile
 
 include $(topsrcdir)/config/rules.mk
 
+# Attempt to properly handle NSS' refusal to implement a dependency system
+export:: $(topsrcdir)/../cvsco.log
+	if test `grep -c '^U mozilla/security/nss' $< 2>/dev/null` != 0 -o \
+		`grep -c '^U mozilla/security/coreconf' $< 2>/dev/null` != 0; then \
+		$(MAKE) -C $(topsrcdir)/security/coreconf $(DEFAULT_GMAKE_FLAGS) clean ; \
+		$(MAKE) -C $(topsrcdir)/security/nss/lib $(DEFAULT_GMAKE_FLAGS) clean ; \
+	fi
+
 dependclean export::
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
@@ -124,7 +132,7 @@ endif
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@
 	$(MAKE) -C pki $@
-	
+
 clean clobber clobber_all realclean distclean depend::
 	$(MAKE) -C boot $@
 	$(MAKE) -C ssl $@