diff --git a/README_BUILD_FIRESTORM_LINUX.txt b/README_BUILD_FIRESTORM_LINUX.txt
index fc14b36453..59ba792db8 100644
--- a/README_BUILD_FIRESTORM_LINUX.txt
+++ b/README_BUILD_FIRESTORM_LINUX.txt
@@ -6,6 +6,9 @@ Note: You must manually install fmod as described there.
 
 Run ./build_firestorm_linux.sh
 
+By default your build will be set to use channel private-(your build machine). If you want to change this, 
+you can use pass the option "--chan private-SomeNameYouPrefer" to the build command above.
+
 NOTE: IF you receive build failures related to libUUID, copy your system libUUID library over the download supplied by SL:
 	cd /your/firestorm/code/tree
 	cp /lib/libuuid.so.1.3.0 libraries/i686-linux/lib_release_client/libuuid.so
diff --git a/README_BUILD_FIRESTORM_MACOSX.txt b/README_BUILD_FIRESTORM_MACOSX.txt
index dede7cbd4b..b0867b0fd0 100644
--- a/README_BUILD_FIRESTORM_MACOSX.txt
+++ b/README_BUILD_FIRESTORM_MACOSX.txt
@@ -1,3 +1,8 @@
-Make sure xcode is installed, with the GCC 4.0 option.
+Make sure xcode is installed, it's a free download from apple.
+Make sure cmake is installed, use at least a 2.8.x version.
 - Additionally, patch your source directory with fmodmacapi per the older snowglobe instructions.
 - run ./build_firestorm_macosx.sh
+
+By default your build will be set to use channel private-(your build machine). If you want to change this, 
+you can use pass the option "--chan private-SomeNameYouPrefer" to the build command above.
+
diff --git a/README_BUILD_FIRESTORM_WIN32.txt b/README_BUILD_FIRESTORM_WIN32.txt
index 94e2e33a0f..ce0ffd9487 100644
--- a/README_BUILD_FIRESTORM_WIN32.txt
+++ b/README_BUILD_FIRESTORM_WIN32.txt
@@ -36,6 +36,9 @@ Execute the command to build firestorm in the cygwin window:
 
 This will do a clean compile. Rebuilds should be possible by specifying --rebuild. 
 
+By default your build will be set to use channel private-(your build machine). If you want to change this, 
+you can use pass the option "--chan private-SomeNameYouPrefer" to the build command above.
+
 NOTE: It is normal to see errors about ambiguous include/library paths at this time. It will not cause the build to fail
 
 A log for the build will be placed in logs/build_firestorm_windows.log
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 63172113c0..d54fd8dee4 100644
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -965,7 +965,9 @@ class Linux_i686Manifest(LinuxManifest):
             self.path("libuuid.so.1")
             self.path("libSDL-1.2.so.0")
             self.path("libELFIO.so")
-            self.path("libopenjpeg.so.1.3.0", "libopenjpeg.so.1.3")
+	    self.path("libopenjpeg.so.1.4.0","libopenjpeg.so.1.4.0")
+            self.path("libopenjpeg.so.1.4", "libopenjpeg.so.1.4")
+	    self.path("libopenjpeg.so.1", "libopenjpeg.so.1")
             self.path("libalut.so")
             self.path("libopenal.so", "libopenal.so.1")
             self.path("libopenal.so", "libvivoxoal.so.1") # vivox's sdk expects this soname