diff --git a/mozilla/layout/svg/renderer/src/libart/nsSVGLibartBitmapAlpha.cpp b/mozilla/layout/svg/renderer/src/libart/nsSVGLibartBitmapAlpha.cpp
index 316661f1f2a..9b94449941a 100644
--- a/mozilla/layout/svg/renderer/src/libart/nsSVGLibartBitmapAlpha.cpp
+++ b/mozilla/layout/svg/renderer/src/libart/nsSVGLibartBitmapAlpha.cpp
@@ -228,7 +228,7 @@ nsSVGLibartBitmapAlpha::GetBits()
 NS_IMETHODIMP_(nsISVGLibartBitmap::PixelFormat)
 nsSVGLibartBitmapAlpha::GetPixelFormat()
 {
-#if defined(XP_WIN) || defined(XP_BEOS) || defined(MOZ_WIDGET_PHOTON)
+#if defined(XP_WIN) || defined(XP_BEOS) || defined(MOZ_WIDGET_PHOTON) || defined(XP_OS2)
   return PIXEL_FORMAT_32_BGRA;
 #else
   return PIXEL_FORMAT_32_RGBA;
diff --git a/mozilla/other-licenses/libart_lgpl/Makefile.in b/mozilla/other-licenses/libart_lgpl/Makefile.in
index 7d5d5daef40..73326927448 100644
--- a/mozilla/other-licenses/libart_lgpl/Makefile.in
+++ b/mozilla/other-licenses/libart_lgpl/Makefile.in
@@ -8,6 +8,9 @@ include $(DEPTH)/config/autoconf.mk
 
 MODULE	= libart_lgpl
 LIBRARY_NAME = moz_art_lgpl
+ifneq ($(OS_ARCH),WINNT)
+SHORT_LIBNAME = moz_art
+endif
 GRE_MODULE = 1
 LIB_IS_C_ONLY=1