diff --git a/indra/cmake/00-Common.cmake b/indra/cmake/00-Common.cmake
index 2434f7ae9..e85ba6146 100644
--- a/indra/cmake/00-Common.cmake
+++ b/indra/cmake/00-Common.cmake
@@ -12,10 +12,12 @@ set(CMAKE_CXX_FLAGS_RELEASE
     "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
 set(CMAKE_CXX_FLAGS_RELEASESSE2
     "-DLL_RELEASE=1 -DLL_RELEASE_FOR_DOWNLOAD=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=1 -DNDEBUG")
+#llimage now requires this (?)
+set(CMAKE_C_FLAGS_RELEASESSE2
+    "${CMAKE_CXX_FLAGS_RELEASESSE2}")
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO 
     "-DLL_RELEASE=1 -D_SECURE_SCL=0 -DLL_SEND_CRASH_REPORTS=0 -DNDEBUG -DLL_RELEASE_WITH_DEBUG_INFO=1")
 
-
 # Don't bother with a MinSizeRel build.
 
 set(CMAKE_CONFIGURATION_TYPES "RelWithDebInfo;Release;ReleaseSSE2;Debug" CACHE STRING
@@ -38,10 +40,13 @@ if (WINDOWS)
   set(CMAKE_CXX_FLAGS_RELEASESSE2
       "${CMAKE_CXX_FLAGS_RELEASESSE2} ${LL_CXX_FLAGS} /O2 /Zi /MD /MP /arch:SSE2"
       CACHE STRING "C++ compiler release-SSE2 options" FORCE)
-      
+  set(CMAKE_C_FLAGS_RELEASESSE2
+      "${CMAKE_C_FLAGS_RELEASESSE2} ${LL_C_FLAGS} /O2 /Zi /MD /MP /arch:SSE2"
+      CACHE STRING "C compiler release-SSE2 options" FORCE)
+           
   set(CMAKE_CXX_STANDARD_LIBRARIES "")
   set(CMAKE_C_STANDARD_LIBRARIES "")
-
+	
   add_definitions(
       /DLL_WINDOWS=1
       /DUNICODE
@@ -62,7 +67,9 @@ if (WINDOWS)
     set(CMAKE_CXX_FLAGS_RELEASESSE2
       "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
       CACHE STRING "C++ compiler release-SSE2 options" FORCE)
-   
+    set(CMAKE_C_FLAGS_RELEASESSE2
+      "${CMAKE_CXX_FLAGS_RELEASESSE2} -D_SECURE_STL=0 -D_HAS_ITERATOR_DEBUGGING=0"
+      CACHE STRING "C compiler release-SSE2 options" FORCE)
     add_definitions(
       /Zc:wchar_t-
       )
@@ -184,11 +191,13 @@ if (LINUX)
       add_definitions(-fno-stack-protector)
     endif (NOT STANDALONE)
     set(CMAKE_CXX_FLAGS_RELEASESSE2 "${CMAKE_CXX_FLAGS_RELEASESSE2} -mfpmath=sse2 -msse2")
+    set(CMAKE_C_FLAGS_RELEASESSE2 "${CMAKE_C_FLAGS_RELEASESSE2} -mfpmath=sse2 -msse2")
   endif (VIEWER)
 
   set(CMAKE_CXX_FLAGS_DEBUG "-fno-inline ${CMAKE_CXX_FLAGS_DEBUG}")
   set(CMAKE_CXX_FLAGS_RELEASE "-O2 ${CMAKE_CXX_FLAGS_RELEASE}")
   set(CMAKE_CXX_FLAGS_RELEASESSE2 "-O2 ${CMAKE_CXX_FLAGS_RELEASESSE2}")
+  set(CMAKE_C_FLAGS_RELEASESSE2 "-O2 ${CMAKE_C_FLAGS_RELEASESSE2}")
 endif (LINUX)
 
 
diff --git a/indra/cmake/CopyWinLibs.cmake b/indra/cmake/CopyWinLibs.cmake
index 12de2813a..1a3a9b026 100644
--- a/indra/cmake/CopyWinLibs.cmake
+++ b/indra/cmake/CopyWinLibs.cmake
@@ -437,7 +437,7 @@ if (MSVC80)
             COMMENT "Creating release app config file"
             )
 
-        set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
+        set(releasesse2_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/ReleaseSSE2/${VIEWER_BINARY_NAME}.exe.config)
         add_custom_command(
             OUTPUT ${releasesse2_appconfig_file}
             COMMAND ${PYTHON_EXECUTABLE}
@@ -450,7 +450,7 @@ if (MSVC80)
             COMMENT "Creating release-sse2 app config file"
             )
             
-        set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/Release/${VIEWER_BINARY_NAME}.exe.config)
+        set(relwithdebinfo_appconfig_file ${CMAKE_CURRENT_BINARY_DIR}/RelWithDebInfo/${VIEWER_BINARY_NAME}.exe.config)
         add_custom_command(
             OUTPUT ${relwithdebinfo_appconfig_file}
             COMMAND ${PYTHON_EXECUTABLE}