diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebAppGallery/WebAppGalleryController.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebAppGallery/WebAppGalleryController.cs
index a2a0fd24..3ba7ed7c 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebAppGallery/WebAppGalleryController.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/Code/WebAppGallery/WebAppGalleryController.cs
@@ -78,12 +78,12 @@ namespace WebsitePanel.EnterpriseServer
 
             if (Utils.ParseBool(serviceSettings["FeedEnableMicrosoft"], true))
             {
-                arFeeds.Add("https://www.microsoft.com/web/webpi/3.0/WebProductList.xml");
+                arFeeds.Add(esServers.MAIN_WPI_FEED);
             }
 
             if (Utils.ParseBool(serviceSettings["FeedEnableHelicon"], true))
             {
-                arFeeds.Add("http://www.helicontech.com/zoo/feed/wsp");
+                arFeeds.Add(esServers.HELICON_WPI_FEED);
             }
 
             string additionalFeeds = serviceSettings["FeedUrls"];
diff --git a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esServers.asmx.cs b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esServers.asmx.cs
index 05f403ee..51e76e44 100644
--- a/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esServers.asmx.cs
+++ b/WebsitePanel/Sources/WebsitePanel.EnterpriseServer/esServers.asmx.cs
@@ -54,6 +54,9 @@ namespace WebsitePanel.EnterpriseServer
     [ToolboxItem(false)]
     public class esServers : System.Web.Services.WebService
     {
+        public const string MAIN_WPI_FEED = "https://www.microsoft.com/web/webpi/4.0/WebProductList.xml";
+        public const string HELICON_WPI_FEED = "http://www.helicontech.com/zoo/feed/wsp4";
+
         #region Servers
         [WebMethod]
         public List<ServerInfo> GetAllServers()
@@ -677,12 +680,12 @@ namespace WebsitePanel.EnterpriseServer
             
             if (Utils.ParseBool(wpiSettings["FeedEnableMicrosoft"] ,true))
             {
-                arFeeds.Add( "https://www.microsoft.com/web/webpi/3.0/WebProductList.xml" );
+                arFeeds.Add( MAIN_WPI_FEED );
             }
 
             if (Utils.ParseBool(wpiSettings["FeedEnableHelicon"] ,true))
             {
-                arFeeds.Add( "http://www.helicontech.com/zoo/feed/wsp" );
+                arFeeds.Add( HELICON_WPI_FEED );
             }
             
             string additionalFeeds = wpiSettings["FeedUrls"];
diff --git a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebApplicationGallery.cs b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebApplicationGallery.cs
index ed925e7a..913e9a2a 100644
--- a/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebApplicationGallery.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Providers.Web.IIs60/WebApplicationGallery.cs
@@ -71,7 +71,8 @@ namespace WebsitePanel.Providers.Web
 		public const string WAG_XML_FEED_CACHE_KEY = "WAG_XML_FEED_CACHE_KEY";
 		public const int WEB_APPLICATIONS_CACHE_STORE_MINUTES = 60;
 		public const int XML_FEED_RECOVERY_ATTEMPTS = 10;
-		public const string WAG_DEFAULT_FEED_URL = "https://www.microsoft.com/web/webpi/3.0/WebApplicationList.xml";
+		// public const string WAG_DEFAULT_FEED_URL = "https://www.microsoft.com/web/webpi/3.0/WebApplicationList.xml";
+        public const string WAG_DEFAULT_FEED_URL = "https://www.microsoft.com/web/webpi/4.0/webapplicationlist.xml";
 
         // well-known parameters matching
         public readonly Dictionary<string, DeploymentParameterWellKnownTag> wellKnownParameters
diff --git a/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj b/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
index e5ada2a5..33355971 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
+++ b/WebsitePanel/Sources/WebsitePanel.Server.WPIService/WebsitePanel.Server.WPIService.csproj
@@ -68,6 +68,9 @@
       <Name>WebsitePanel.Server.WPIServiceContract</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="app.config" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>
diff --git a/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs b/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
index 2bf09ed6..c067889a 100644
--- a/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
+++ b/WebsitePanel/Sources/WebsitePanel.Server/Code/WPIHelper.cs
@@ -60,7 +60,8 @@ namespace WebsitePanel.Server.Code
 
         private readonly List<string> _feeds;
         private string _webPIinstallersFolder;
-        private const string MainWpiFeed = "https://www.microsoft.com/web/webpi/3.0/webproductlist.xml";
+        //private const string MainWpiFeed = "https://www.microsoft.com/web/webpi/3.0/webproductlist.xml";
+        private const string MainWpiFeed = "https://www.microsoft.com/web/webpi/4.0/WebProductList.xml";
         private const string IisChoiceProduct = "StaticContent";
         private const string WebMatrixChoiceProduct = "WebMatrix";
         private ProductManager _productManager;