diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
index f4f17b52a015..4138e830d8d9 100644
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -48,7 +48,9 @@ LIBRARY_NAME	= mozlibpixman
 LIBXUL_LIBRARY = 1
 
 ifeq ($(OS_ARCH)_$(GNU_CC), WINNT_)
-#USE_STATIC_VC71_LIB = 1
+ifeq ($(MOZ_OPTIMIZE),1)
+USE_STATIC_VC71_LIB = 1
+endif
 endif
 
 CSRCS	= \
@@ -85,6 +87,6 @@ include $(topsrcdir)/config/rules.mk
 ifeq ($(USE_STATIC_VC71_LIB),1)
 libs:: $(srcdir)/pixman-vc71.lib
 	cp $(srcdir)/pixman-vc71.lib $(LIBRARY)
-	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib/
+	$(INSTALL) $(IFLAGS1) $(LIBRARY) $(DIST)/lib
 endif
 
diff --git a/gfx/cairo/libpixman/src/pixman-vc71.lib b/gfx/cairo/libpixman/src/pixman-vc71.lib
index 5af938d90ea7..e9b3f66bc03a 100644
Binary files a/gfx/cairo/libpixman/src/pixman-vc71.lib and b/gfx/cairo/libpixman/src/pixman-vc71.lib differ