diff --git a/indra/cmake/Copy3rdPartyLibs.cmake b/indra/cmake/Copy3rdPartyLibs.cmake
index 9238d232b865e2d398050e78797b9ff5b578d84b..eaf1e31fcec61ff3e3759ce88409a580489f0943 100644
--- a/indra/cmake/Copy3rdPartyLibs.cmake
+++ b/indra/cmake/Copy3rdPartyLibs.cmake
@@ -39,11 +39,20 @@ if(WINDOWS)
         libeay32.dll
         glod.dll
         libhunspell.dll
-        BugSplat64.dll
-        BugSplatRc64.dll
-        BsSndRpt64.exe
         )
 
+    # Filenames are different for 32/64 bit BugSplat file and we don't
+    # have any control over them so need to branch.
+    if(ADDRESS_SIZE EQUAL 32)
+        set(release_files ${release_files} BugSplat.dll)
+        set(release_files ${release_files} BugSplatRc.dll)
+        set(release_files ${release_files} BsSndRpt.exe)
+    else(ADDRESS_SIZE EQUAL 32)
+        set(release_files ${release_files} BugSplat64.dll)
+        set(release_files ${release_files} BugSplatRc64.dll)
+        set(release_files ${release_files} BsSndRpt64.exe)
+    endif(ADDRESS_SIZE EQUAL 32)
+
     if (FMODEX)
 
         if(ADDRESS_SIZE EQUAL 32)