diff --git a/OpenSim/Region/Application/Application.cs b/OpenSim/Region/Application/Application.cs
index 7b9d35d447..bd2445cbc8 100644
--- a/OpenSim/Region/Application/Application.cs
+++ b/OpenSim/Region/Application/Application.cs
@@ -74,7 +74,11 @@ namespace OpenSim
             AppDomain.CurrentDomain.UnhandledException +=
                 new UnhandledExceptionEventHandler(CurrentDomain_UnhandledException);
 
-            ServicePointManager.DefaultConnectionLimit = 128;
+            if(!Util.IsWindows())
+                ServicePointManager.DefaultConnectionLimit = 12;
+            else
+                ServicePointManager.DefaultConnectionLimit = 32;
+
             ServicePointManager.UseNagleAlgorithm = false;
 
             // Add the arguments supplied when running the application to the configuration
diff --git a/OpenSim/Server/ServerMain.cs b/OpenSim/Server/ServerMain.cs
index 74bb163ffb..6938db7ca4 100644
--- a/OpenSim/Server/ServerMain.cs
+++ b/OpenSim/Server/ServerMain.cs
@@ -54,7 +54,7 @@ namespace OpenSim.Server
 
         public static int Main(string[] args)
         {
-            ServicePointManager.DefaultConnectionLimit = 4096;
+            ServicePointManager.DefaultConnectionLimit = 64;
             ServicePointManager.UseNagleAlgorithm = false;
 
             m_Server = new HttpServerBase("R.O.B.U.S.T.", args);