diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index dbc35f158f..bc1da38749 100755
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -275,6 +275,10 @@ if (LINUX)
   endif( NO_OMIT_FRAMEPOINTER )
   # </FS:ND>
 
+  if (ND_BUILD64BIT_ARCH)
+    set( ENABLE_MEDIA_PLUGINS ON CACHE BOOL "Build with media plugins" )
+  endif (ND_BUILD64BIT_ARCH)
+
 endif (LINUX)
 
 
diff --git a/indra/cmake/WebKitLibPlugin.cmake b/indra/cmake/WebKitLibPlugin.cmake
index f8bc1743f5..f54a233022 100755
--- a/indra/cmake/WebKitLibPlugin.cmake
+++ b/indra/cmake/WebKitLibPlugin.cmake
@@ -78,7 +78,7 @@ elseif (LINUX)
         QtGui
         QtCore
           jpeg
-#        jscore
+        jscore
 #        qgif
 #        qjpeg
 #        jpeg
@@ -86,9 +86,9 @@ elseif (LINUX)
         X11
         Xrender
         GL
-
 #        sqlite3
 #        Xi
 #        SM
         )
+    endif (USESYSTEMLIBS)	
 endif (WINDOWS)
diff --git a/indra/llplugin/CMakeLists.txt b/indra/llplugin/CMakeLists.txt
index 32152a2354..583d2b739e 100755
--- a/indra/llplugin/CMakeLists.txt
+++ b/indra/llplugin/CMakeLists.txt
@@ -70,7 +70,9 @@ list(APPEND llplugin_SOURCE_FILES ${llplugin_HEADER_FILES})
 
 add_library (llplugin ${llplugin_SOURCE_FILES})
 
-##add_subdirectory(slplugin)
+if (ENABLE_MEDIA_PLUGINS)
+  add_subdirectory(slplugin)
+endif (ENABLE_MEDIA_PLUGINS)
 
 # Add tests
 if (LL_TESTS)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index c174900347..53a12caff6 100755
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -74,7 +74,10 @@ if(FMODEX)
 endif(FMODEX)
 
 # install SLPlugin host executable and its dynamic-library plugins
-use_prebuilt_binary(slplugins)
+if (NOT ENABLE_MEDIA_PLUGINS)
+  use_prebuilt_binary(slplugins)
+endif (NOT ENABLE_MEDIA_PLUGINS)
+
 if(LEAPMOTION)
   add_definitions(-DUSE_LEAPMOTION=1)
   include_directories(${LEAP_MOTION_INCLUDE_DIR})
@@ -2370,6 +2373,7 @@ if (LINUX)
   set(product Firestorm-${ARCH}-${VIEWER_SHORT_VERSION}.${VIEWER_VERSION_REVISION})
 
   # These are the generated targets that are copied to package/
+if (NOT ENABLE_MEDIA_PLUGINS)
   set(COPY_INPUT_DEPENDENCIES
     ${VIEWER_BINARY_NAME}
     linux-crash-logger
@@ -2378,6 +2382,16 @@ if (LINUX)
 ##  media_plugin_gstreamer010
     llcommon
     )
+else (NOT ENABLE_MEDIA_PLUGINS)
+  set(COPY_INPUT_DEPENDENCIES
+    ${VIEWER_BINARY_NAME}
+    linux-crash-logger
+    SLPlugin
+    media_plugin_webkit
+    media_plugin_gstreamer010
+    llcommon
+    )
+endif (NOT ENABLE_MEDIA_PLUGINS)
 
   add_dependencies(${VIEWER_BINARY_NAME} generate_viewer_version)
 
diff --git a/indra/newview/viewer_manifest.py b/indra/newview/viewer_manifest.py
index 3335951ad8..da6aeafdb9 100755
--- a/indra/newview/viewer_manifest.py
+++ b/indra/newview/viewer_manifest.py
@@ -1500,6 +1500,7 @@ class Linux_x86_64_Manifest(LinuxManifest):
 
         if self.is_packaging_viewer():
           if self.prefix("../packages/lib/release", dst="lib"):
+            self.path("libffi*.so*")
 
             # vivox 32-bit hack.
             # one has to extract libopenal.so from the 32-bit openal package, or official LL viewer, and rename it to libopenal32.so
@@ -1525,7 +1526,17 @@ class Linux_x86_64_Manifest(LinuxManifest):
               print "Leap Motion library not found"
           self.end_prefix("lib")
 
-        # support file for valgrind debug tool
+        if self.prefix(src="", dst="bin"):
+            self.path2basename("../llplugin/slplugin", "SLPlugin")
+            self.end_prefix("bin")        # support file for valgrind debug tool
+
+        # plugins
+        if self.prefix(src="", dst="bin/llplugin"):
+            self.path2basename("../media_plugins/webkit", "libmedia_plugin_webkit.so")
+            self.path("../media_plugins/gstreamer010/libmedia_plugin_gstreamer010.so", "libmedia_plugin_gstreamer.so")
+            self.end_prefix("bin/llplugin")
+                                                        
+            
         self.path("secondlife-i686.supp")
 
 ################################################################
diff --git a/package_override_gcc.ini b/package_override_gcc.ini
index d61ddcb50c..fea38447ae 100644
--- a/package_override_gcc.ini
+++ b/package_override_gcc.ini
@@ -96,3 +96,6 @@ linux =  http://downloads.phoenixviewer.com/open_libndofdev-0.3-linux-x64-201505
 
 [uriparser]
 linux = http://downloads.phoenixviewer.com/uriparser-0.8.0.1-linux-x64-201502251606-r15.tar.bz2|e67a27e13e546cbb13fad2665a1896b7
+
+[slplugins]
+linux = 
\ No newline at end of file