diff --git a/gfx/cairo/libpixman/src/Makefile.in b/gfx/cairo/libpixman/src/Makefile.in
index c1a27b98c641..4f26babefa0a 100644
--- a/gfx/cairo/libpixman/src/Makefile.in
+++ b/gfx/cairo/libpixman/src/Makefile.in
@@ -71,6 +71,7 @@ USE_MMX=1
 endif
 USE_SSE2=1
 MMX_CFLAGS=
+SSE2_CFLAGS=
 endif
 ifeq (arm,$(findstring arm,$(OS_TEST)))
 USE_ARM_SIMD_MSVC=1
@@ -81,9 +82,15 @@ ifdef GNU_CC
 ifeq (86,$(findstring 86,$(OS_TEST)))
 USE_MMX=1
 MMX_CFLAGS=-mmmx -Winline
-# See bug 410509 why we can't use SSE2 yet on linux
-#USE_SSE2=1
-#MMX_CFLAGS+=-msse -msse2
+ifeq (64,$(findstring 64,$(OS_TEST)))
+USE_SSE2=1
+endif
+ifdef HAVE_GCC_ALIGN_ARG_POINTER
+USE_SSE2=1
+endif
+ifdef USE_SSE2
+SSE2_CFLAGS=-msse -msse2 -Winline
+endif
 ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
 MMX_CFLAGS+=--param inline-unit-growth=10000 --param large-function-growth=10000
 endif
@@ -194,7 +201,7 @@ pixman-mmx.$(OBJ_SUFFIX): pixman-mmx.c $(GLOBAL_DEPS)
 pixman-sse2.$(OBJ_SUFFIX): pixman-sse2.c $(GLOBAL_DEPS)
 	$(REPORT_BUILD)
 	@$(MAKE_DEPS_AUTO_CC)
-	$(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $(MMX_CFLAGS) $(_VPATH_SRCS)
+	$(ELOG) $(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $(SSE2_CFLAGS) $(_VPATH_SRCS)
 
 pixman-arm-neon.$(OBJ_SUFFIX): pixman-arm-neon.c $(GLOBAL_DEPS)
 	$(REPORT_BUILD)