diff --git a/build/unix/gnu-ld-scripts/components-mapfile b/build/unix/gnu-ld-scripts/components-mapfile
index cc17a9f4932..ed06d073930 100644
--- a/build/unix/gnu-ld-scripts/components-mapfile
+++ b/build/unix/gnu-ld-scripts/components-mapfile
@@ -6,8 +6,3 @@
 		NSUnregisterSelf;
    local: *;
 };
-~
-~
-
-~
-
diff --git a/configure.in b/configure.in
index d4cee365b3a..2ba6e8e9725 100644
--- a/configure.in
+++ b/configure.in
@@ -1339,6 +1339,15 @@ case "$target" in
     *-linux*)
         MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
         ;;
+    *-solaris*)
+        if test -z "$GNU_LD"; then
+         if test -z "$GNU_CC"; then
+          MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-M $(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'
+         else
+          MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,-M -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-mapfile'
+         fi
+        fi
+        ;;
     *-nto*) 
         MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script'
         ;;