diff --git a/doc/contributions.txt b/doc/contributions.txt
index d8dec69269891f9d80f871c4e9c7b312caf7c6a9..d7fdba0d3cba39859b3e1b7a55fef39093113b20 100644
--- a/doc/contributions.txt
+++ b/doc/contributions.txt
@@ -172,6 +172,7 @@ Boroondas Gupte
 	VWR-233
 	VWR-20583
 	VWR-20891
+	VWR-23455
 	WEB-262
 Bulli Schumann
 	CT-218
diff --git a/indra/cmake/FMOD.cmake b/indra/cmake/FMOD.cmake
index 4582017bcbe7026f8bf4abef551210cb02f87290..fd9d5fe1979870b993ec84315087701cc8e0e972 100755
--- a/indra/cmake/FMOD.cmake
+++ b/indra/cmake/FMOD.cmake
@@ -1,5 +1,7 @@
 # -*- cmake -*-
-include(Prebuilt)
+if (INSTALL_PROPRIETARY)
+  include(Prebuilt)
+endif (INSTALL_PROPRIETARY)
 
 set(FMOD_FIND_QUIETLY OFF)
 set(FMOD_FIND_REQUIRED OFF)
@@ -7,7 +9,9 @@ set(FMOD_FIND_REQUIRED OFF)
 if (STANDALONE)
   include(FindFMOD)
 else (STANDALONE)
-  use_prebuilt_binary(fmod)
+  if (INSTALL_PROPRIETARY)
+    use_prebuilt_binary(fmod)
+  endif (INSTALL_PROPRIETARY)
   
   if (WINDOWS)
     set(FMOD_LIBRARY fmod)