diff --git a/toolkit/library/Makefile.in b/toolkit/library/Makefile.in
index 8a47dd68f35..92130cf6e6f 100644
--- a/toolkit/library/Makefile.in
+++ b/toolkit/library/Makefile.in
@@ -130,14 +130,14 @@ SDK_LIBRARY = $(SHARED_LIBRARY)
 endif
 
 # See bug 653662 - some builders are hitting an internal size limit
-# on incremental builds. Disable this for debug builds for now. We may
-# be able to revisit this after our builders are upgraded to something
-# later than Visual Studio 2005.
+# on incremental builds. Disable this for debug builds using VC8/9.
 ifeq ($(OS_ARCH),WINNT)
+ifeq (,$(filter-out 1400 1500,$(_MSC_VER)))
 ifdef MOZ_DEBUG
 EXTRA_DSO_LDOPTS += -INCREMENTAL:NO
 endif
 endif
+endif
 
 EXTRA_DSO_LDOPTS += $(LIBS_DIR) $(EXTRA_DSO_LIBS)