diff --git a/mozilla/browser/installer/unix/packages-static b/mozilla/browser/installer/unix/packages-static
index d5a5e1056c0..dc7c54a6644 100644
--- a/mozilla/browser/installer/unix/packages-static
+++ b/mozilla/browser/installer/unix/packages-static
@@ -267,12 +267,9 @@ bin/res/entityTables/*
 bin/res/builtin/platformHTMLBindings.xml
 
 ; svg
-bin/components/libgksvgcairo.so
 bin/res/svg.css
 bin/res/svg.properties
 bin/components/dom_svg.xpt
-bin/libcairo.so.1
-bin/libpixman.so.1
 
 ; [Personal Security Manager]
 ;
diff --git a/mozilla/layout/build/Makefile.in b/mozilla/layout/build/Makefile.in
index 3e02cb2c0d2..bab93c83e37 100644
--- a/mozilla/layout/build/Makefile.in
+++ b/mozilla/layout/build/Makefile.in
@@ -181,6 +181,11 @@ SHARED_LIBRARY_LIBS += \
                 $(DIST)/lib/$(LIB_PREFIX)gksvgrendererlibart_s.$(LIB_SUFFIX) \
                 $(NULL)
 endif
+ifdef MOZ_SVG_RENDERER_CAIRO
+SHARED_LIBRARY_LIBS += \
+                $(DIST)/lib/$(LIB_PREFIX)gksvgrenderercairo_s.$(LIB_SUFFIX) \
+                $(NULL)
+endif
 endif
 
 EXTRA_DSO_LDOPTS = \
@@ -205,13 +210,10 @@ EXTRA_DSO_LDOPTS += $(MOZ_GTK2_LIBS) \
 		    $(NULL)
 endif
 
-ifdef MOZ_ENABLE_CAIRO
-# don't add twice
-ifndef MOZ_SVG_RENDERER_CAIRO
+ifneq (,$(MOZ_ENABLE_CAIRO)$(MOZ_SVG_RENDERER_CAIRO))
 EXTRA_DSO_LDOPTS += $(MOZ_CAIRO_LIBS) \
 		    $(NULL)
 endif
-endif
 
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 EXTRA_DSO_LDOPTS += \
diff --git a/mozilla/layout/build/nsLayoutModule.cpp b/mozilla/layout/build/nsLayoutModule.cpp
index 495f94a4749..3fb688cf3e6 100644
--- a/mozilla/layout/build/nsLayoutModule.cpp
+++ b/mozilla/layout/build/nsLayoutModule.cpp
@@ -484,6 +484,9 @@ nsresult NS_NewSVGRendererGDIPlus(nsISVGRenderer** aResult);
 #ifdef MOZ_SVG_RENDERER_LIBART
 nsresult NS_NewSVGRendererLibart(nsISVGRenderer** aResult);
 #endif // MOZ_SVG_RENDERER_LIBART
+#ifdef MOZ_SVG_RENDERER_CAIRO
+nsresult NS_NewSVGRendererCairo(nsISVGRenderer** aResult);
+#endif // MOZ_SVG_RENDERER_CAIRO
 #endif
 
 #define MAKE_CTOR(ctor_, iface_, func_)                   \
@@ -528,6 +531,9 @@ MAKE_CTOR(CreateNewSVGRendererGDIPlus,  nsISVGRenderer,         NS_NewSVGRendere
 #ifdef MOZ_SVG_RENDERER_LIBART
 MAKE_CTOR(CreateNewSVGRendererLibart,   nsISVGRenderer,         NS_NewSVGRendererLibart)
 #endif // MOZ_SVG_RENDERER_LIBART
+#ifdef MOZ_SVG_RENDERER_CAIRO
+MAKE_CTOR(CreateNewSVGRendererCairo,   nsISVGRenderer,         NS_NewSVGRendererCairo)
+#endif // MOZ_SVG_RENDERER_CAIRO
 #endif
 MAKE_CTOR(CreateCaret,                  nsICaret,               NS_NewCaret)
 
@@ -829,6 +835,12 @@ static const nsModuleComponentInfo gComponents[] = {
     NS_SVG_RENDERER_LIBART_CONTRACTID,
     CreateNewSVGRendererLibart },
 #endif // MOZ_SVG_RENDERER_LIBART
+#ifdef MOZ_SVG_RENDERER_CAIRO
+  { "SVG Cairo Renderer",
+    NS_SVG_RENDERER_CAIRO_CID,
+    NS_SVG_RENDERER_CAIRO_CONTRACTID,
+    CreateNewSVGRendererCairo },
+#endif // MOZ_SVG_RENDERER_CAIRO
 #endif // MOZ_SVG
 
 #ifdef DEBUG
diff --git a/mozilla/layout/svg/renderer/src/cairo/Makefile.in b/mozilla/layout/svg/renderer/src/cairo/Makefile.in
index 5475ee34cb8..eb0d81b691f 100644
--- a/mozilla/layout/svg/renderer/src/cairo/Makefile.in
+++ b/mozilla/layout/svg/renderer/src/cairo/Makefile.in
@@ -46,13 +46,9 @@ VPATH		= @srcdir@
 include $(DEPTH)/config/autoconf.mk
 
 MODULE = gksvgcairo
-LIBRARY_NAME = gksvgcairo
-# Do not set EXPORT_LIBRARY as we do not want gksvgcairo in the static lib list
-#EXPORT_LIBRARY = 1
-IS_COMPONENT = 1
-GRE_MODULE = 1
-FORCE_SHARED_LIB = 1
-MOZILLA_INTERNAL_API = 1
+LIBRARY_NAME = gksvgrenderercairo_s
+FORCE_STATIC_LIB = 1
+LIBXUL_LIBRARY = 1
 
 REQUIRES = \
 	xpcom   \
@@ -85,8 +81,6 @@ CPPSRCS = \
 	nsSVGCairoSurface.cpp \
 	$(NULL)
 
-EXTRA_DSO_LIBS = gkgfx
-
 # **********************************************************************
 
 include $(topsrcdir)/config/rules.mk
@@ -114,12 +108,3 @@ endif
 ifneq (,$(filter mac cocoa,$(MOZ_WIDGET_TOOLKIT)))
 LOCAL_INCLUDES +=  -I$(topsrcdir)/gfx/src/mac
 endif
-
-EXTRA_DSO_LDOPTS += \
-		$(LIBS_DIR) \
-		$(EXTRA_DSO_LIBS) \
-		$(MOZ_UNICHARUTIL_LIBS) \
-		$(MOZ_CAIRO_LIBS) \
-		$(TK_LIBS) \
-		$(MOZ_COMPONENT_LIBS) \
-		$(NULL)
diff --git a/mozilla/layout/svg/renderer/src/cairo/nsSVGRendererCairo.cpp b/mozilla/layout/svg/renderer/src/cairo/nsSVGRendererCairo.cpp
index 76922f71650..264b7d6c0bc 100644
--- a/mozilla/layout/svg/renderer/src/cairo/nsSVGRendererCairo.cpp
+++ b/mozilla/layout/svg/renderer/src/cairo/nsSVGRendererCairo.cpp
@@ -47,7 +47,6 @@
 #include "nsSVGCairoCanvas.h"
 #include "nsSVGCairoRegion.h"
 #include "nsSVGCairoSurface.h"
-#include "nsIGenericFactory.h"
 
 /**
  * \addtogroup cairo_renderer Cairo Rendering Engine
@@ -157,17 +156,3 @@ nsSVGRendererCairo::CreateSurface(PRUint32 width, PRUint32 height,
 {
   return NS_NewSVGCairoSurface(_retval, width, height);
 }
-
-
-/* Component manager stuff */
-
-NS_GENERIC_FACTORY_CONSTRUCTOR(nsSVGRendererCairo)
-
-static const nsModuleComponentInfo gComponents[] = {
-  { "SVG Cairo Renderer",
-    NS_SVG_RENDERER_CAIRO_CID,
-    NS_SVG_RENDERER_CAIRO_CONTRACTID,
-    nsSVGRendererCairoConstructor }
-};
-
-NS_IMPL_NSGETMODULE(nsSVGRendererCairo, gComponents)
diff --git a/mozilla/xpinstall/packager/packages-unix b/mozilla/xpinstall/packager/packages-unix
index f7521a2779c..a9c04bd86a0 100644
--- a/mozilla/xpinstall/packager/packages-unix
+++ b/mozilla/xpinstall/packager/packages-unix
@@ -366,12 +366,9 @@ bin/res/dtd/*
 bin/res/builtin/platformHTMLBindings.xml
 
 ; svg
-bin/components/libgksvgcairo.so
 bin/res/svg.css
 bin/res/svg.properties
 bin/components/dom_svg.xpt
-bin/libcairo.so.1
-bin/libpixman.so.1
 
 [mail]
 bin/libmsgbaseutil.so