diff --git a/doc/contributions.txt b/doc/contributions.txt
index fd4315552335c5f48380becfee90911e2c77cfa1..f7dada053be09207533abc6284dc8d0a590c7d3c 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -520,6 +520,7 @@ Robin Cornelius
 	SNOW-484
 	SNOW-506
 	SNOW-514
+	SNOW-585
 	VWR-2488
 	VWR-9557
 	VWR-11128
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index ecca00399663b4f848d4a257e8628a48ac701ef3..9885d1aa0d9f0b2a5c90d459eb2ee1eb53b31f6b 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -316,8 +316,11 @@ class WindowsManifest(ViewerManifest):
         # For use in crash reporting (generates minidumps)
         self.path("dbghelp.dll")
 
-        # For using FMOD for sound... DJS
-        self.path("fmod.dll")
+        try:
+            # FMOD for sound
+            self.path("fmod.dll")
+        except:
+            print "Skipping FMOD - not found"
 
         self.enable_no_crt_manifest_check()
         
@@ -643,8 +646,11 @@ class DarwinManifest(ViewerManifest):
                                     ):
                         self.path(os.path.join(libdir, libfile), libfile)
 
-                #libfmodwrapper.dylib
-                self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
+                try:
+                    # FMOD for sound
+                    self.path(self.args['configuration'] + "/libfmodwrapper.dylib", "libfmodwrapper.dylib")
+                except:
+                    print "Skipping FMOD - not found"
                 
                 # our apps
                 self.path("../mac_crash_logger/" + self.args['configuration'] + "/mac-crash-logger.app", "mac-crash-logger.app")
@@ -933,7 +939,7 @@ class Linux_i686Manifest(LinuxManifest):
                     self.path("libfmod-3.75.so")
                     pass
             except:
-                    print "Skipping libkdu_v42R.so - not found"
+                    print "Skipping libfmod-3.75.so - not found"
                     pass
             self.end_prefix("lib")