diff --git a/indra/cmake/CopyWinLibs.cmake.in b/indra/cmake/CopyWinLibs.cmake.in
index 91d5235a9..16be776d6 100644
--- a/indra/cmake/CopyWinLibs.cmake.in
+++ b/indra/cmake/CopyWinLibs.cmake.in
@@ -26,13 +26,13 @@ function(copy_files paths names dest)
   foreach(f ${names})
     foreach(p ${paths})
 	  set(from_file "${p}/${f}")
-	  set(to_dest "${CMAKE_BINARY_DIR}/newview/${dest}")
+	  set(to_dest "${CMAKE_BINARY_DIR}/newview/${dest}/")
 	  if(EXISTS ${from_file})
 	    message("Copying ${from_file} to ${to_dest}")
 		if(NOT EXISTS ${to_dest})
-		  execute_process(COMMAND mkdir -p "${to_dest}")
+		  execute_process(COMMAND md "${to_dest}")
 		endif(NOT EXISTS ${to_dest})
-	    execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${from_file} ${to_dest} RESULT_VARIABLE result)
+	    execute_process(COMMAND ${CMAKE_COMMAND} -E copy "${from_file}" "${to_dest}${f}"	 RESULT_VARIABLE result)
 		if(${result})
 		  message(SEND_ERROR "Unsuccessful.")
 		endif(${result})
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index e40624d2e..0ff76cb36 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -1712,7 +1712,9 @@ if (DARWIN)
       --grid=${GRID}
       --source=${CMAKE_CURRENT_SOURCE_DIR}
       --extra_libraries="${MANIFEST_LIBRARIES}"
-    DEPENDS ${VIEWER_BINARY_NAME} ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
+    DEPENDS
+	  ${VIEWER_BINARY_NAME}
+	  ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
     )
 
   add_dependencies(${VIEWER_BINARY_NAME} SLPlugin media_plugin_quicktime media_plugin_webkit basic_plugin_filepicker)
@@ -1738,6 +1740,7 @@ if (DARWIN)
           --extra_libraries="${MANIFEST_LIBRARIES}"
           --touch=${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/.${product}.touched
         DEPENDS
+		  ${VIEWER_BINARY_NAME}
           ${CMAKE_CURRENT_SOURCE_DIR}/viewer_manifest.py
       )
   endif (PACKAGE)