diff --git a/autobuild.xml b/autobuild.xml
index c030ee1117085f79fd38fdf501a969f9b2517119..9b670e5875c80c590ed72bb835dbae9b13d6fbaa 100644
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1478,7 +1478,7 @@
         <key>license</key>
         <string>xmlrpc-epi</string>
         <key>license_file</key>
-        <string>LICENSES/xmlrpc.txt</string>
+        <string>LICENSES/xmlrpc-epi.txt</string>
         <key>name</key>
         <string>xmlrpc-epi</string>
         <key>platforms</key>
@@ -1512,9 +1512,9 @@
             <key>archive</key>
             <map>
               <key>hash</key>
-              <string>ea06e2f1c1ed59a2d2b6cdb6f459d1c0</string>
+              <string>5181d1a8f2516928ac064d72acf164a4</string>
               <key>url</key>
-              <string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/xmlrpc-epi-0.51-windows-20101001a.tar.bz2</string>
+              <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-xmlrpc-epi/rev/222021/arch/CYGWIN/installer/xmlrpc_epi-0.54.1-windows-20110224.tar.bz2</string>
             </map>
             <key>name</key>
             <string>windows</string>
diff --git a/indra/cmake/XmlRpcEpi.cmake b/indra/cmake/XmlRpcEpi.cmake
index 107d1926bae597cbbc702923a53b3efa5320c107..5bd48482450415f829336eb962d8d141d4611ab4 100644
--- a/indra/cmake/XmlRpcEpi.cmake
+++ b/indra/cmake/XmlRpcEpi.cmake
@@ -9,7 +9,10 @@ if (STANDALONE)
 else (STANDALONE)
     use_prebuilt_binary(xmlrpc-epi)
     if (WINDOWS)
-        set(XMLRPCEPI_LIBRARIES xmlrpcepi)
+        set(XMLRPCEPI_LIBRARIES 
+            debug xmlrpc-epid
+            optimized xmlrpc-epi
+        )
     else (WINDOWS)
         set(XMLRPCEPI_LIBRARIES xmlrpc-epi)
     endif (WINDOWS)
diff --git a/indra/newview/CMakeLists.txt b/indra/newview/CMakeLists.txt
index db029f9de7bd07bf397bf867b58ec0ba5e170c9b..1f07af0608068fb3279461e67deb0cf88ec1117f 100644
--- a/indra/newview/CMakeLists.txt
+++ b/indra/newview/CMakeLists.txt
@@ -10,6 +10,7 @@ include(DirectX)
 include(OpenSSL)
 include(DragDrop)
 include(ELFIO)
+include(EXPAT)
 include(FMOD)
 include(OPENAL)
 include(FindOpenGL)
@@ -1681,6 +1682,7 @@ target_link_libraries(${VIEWER_BINARY_NAME}
     ${SMARTHEAP_LIBRARY}
     ${UI_LIBRARIES}
     ${WINDOWS_LIBRARIES}
+    ${EXPAT_LIBRARIES}
     ${XMLRPCEPI_LIBRARIES}
     ${ELFIO_LIBRARIES}
     ${OPENSSL_LIBRARIES}