diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index 762a5fa55f..8274ef5154 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -2861,8 +2861,10 @@ if (PACKAGE AND (RELEASE_CRASH_REPORTING OR NON_RELEASE_CRASH_REPORTING) AND VIE
     endif (LINUX)
   endif (USE_BUGSPLAT)
 
-  # for both Bugsplat and Breakpad
-  add_dependencies(llpackage generate_symbols)
+  if (NOT LINUX) #Linux generates symbols via viewer_manifest.py/fs_viewer_manifest.py
+	# for both Bugsplat and Breakpad
+	add_dependencies(llpackage generate_symbols)
+  endif()
 endif ()
 
 if (LL_TESTS)
diff --git a/indra/newview/fs_viewer_manifest.py b/indra/newview/fs_viewer_manifest.py
index 2112ba1f54..2bf8fe6faf 100644
--- a/indra/newview/fs_viewer_manifest.py
+++ b/indra/newview/fs_viewer_manifest.py
@@ -198,17 +198,16 @@ class FSViewerManifest:
         from shutil import rmtree
         import tarfile
 
-        #if isdir( "symbols" ):
-        #    rmtree( "symbols" )
+        if isdir( "symbols" ):
+            rmtree( "symbols" )
 
-        #files =  glob( "%s/bin/*" % self.args['dest'] )
-        #for f in files:
-        #    self.fs_generate_breakpad_symbols_for_file( f )
-
-        #files =  glob( "%s/lib/*.so" % self.args['dest'] )
-        #for f in files:
-        #    self.fs_generate_breakpad_symbols_for_file( f )
+        files =  glob( "%s/bin/*" % self.args['dest'] )
+        for f in files:
+            self.fs_generate_breakpad_symbols_for_file( f )
 
+        files =  glob( "%s/lib/*.so" % self.args['dest'] )
+        for f in files:
+            self.fs_generate_breakpad_symbols_for_file( f )
 
         if isdir( "symbols" ):
             for a in self.args: