diff --git a/OpenSim/Framework/Servers/BaseOpenSimServer.cs b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
index 2018d55836..e799c23831 100644
--- a/OpenSim/Framework/Servers/BaseOpenSimServer.cs
+++ b/OpenSim/Framework/Servers/BaseOpenSimServer.cs
@@ -206,7 +206,7 @@ namespace OpenSim.Framework.Servers
 
             EnhanceVersionInformation();
 
-            m_log.Info("[STARTUP]: Version " + m_version + "\n");
+            m_log.Info("[STARTUP]: Version: " + m_version + "\n");
         }
 
         /// <summary>
@@ -395,14 +395,7 @@ namespace OpenSim.Framework.Servers
                 EntriesFile.Close();
             }
 
-            if (!string.IsNullOrEmpty(buildVersion))
-            {
-                m_version += ", SVN build r" + buildVersion;
-            }
-            else
-            {
-                m_version += ", SVN build revision not available";
-            }
+            m_version += string.IsNullOrEmpty(buildVersion)? ".00000" : ("." + buildVersion + "     ").Substring(0, 6);
 
             // Add operating system information if available
             string OSString = "";
@@ -421,7 +414,7 @@ namespace OpenSim.Framework.Servers
                 OSString = OSString.Substring(0, 45);
             }
 
-            m_version += ", OS " + OSString;
+            m_version += " (OS " + OSString + ")";
         }
     }
 }
diff --git a/OpenSim/Framework/Servers/VersionInfo.cs b/OpenSim/Framework/Servers/VersionInfo.cs
index d206fc3b38..ed3f2a5955 100644
--- a/OpenSim/Framework/Servers/VersionInfo.cs
+++ b/OpenSim/Framework/Servers/VersionInfo.cs
@@ -32,6 +32,6 @@ namespace OpenSim
     /// </summary>
     public class VersionInfo
     {
-        public readonly static string Version = "OpenSimulator trunk (post 0.5.9)";
+        public readonly static string Version = "OpenSimulator Server  0.5.9";  // stay with 27 chars (used in regioninfo)
     }
 }
diff --git a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
index 3a90cff2bb..e21bf7c1a5 100644
--- a/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
+++ b/OpenSim/Region/ClientStack/LindenUDP/LLClientView.cs
@@ -86,7 +86,7 @@ namespace OpenSim.Region.ClientStack.LindenUDP
 
         private int m_animationSequenceNumber = 1;
 
-        private byte[] m_channelVersion = Utils.StringToBytes("OpenSimulator 0.5"); // Dummy value needed by libSL
+        private byte[] m_channelVersion = Utils.StringToBytes("OpenSimulator Server"); // Dummy value needed by libSL
 
         private Dictionary<string, UUID> m_defaultAnimations = new Dictionary<string, UUID>();
 
diff --git a/OpenSim/Region/Environment/Scenes/Scene.cs b/OpenSim/Region/Environment/Scenes/Scene.cs
index 5e1ad7184d..74502b8080 100644
--- a/OpenSim/Region/Environment/Scenes/Scene.cs
+++ b/OpenSim/Region/Environment/Scenes/Scene.cs
@@ -98,7 +98,7 @@ namespace OpenSim.Region.Environment.Scenes
         private int m_incrementsof15seconds = 0;
         private volatile bool m_backingup = false;
 
-        protected string m_simulatorVersion = "unknown";
+        protected string m_simulatorVersion = "OpenSimulator Server";
 
         protected ModuleLoader m_moduleLoader;
         protected StorageManager m_storageManager;
diff --git a/OpenSim/Region/Environment/Scenes/SceneBase.cs b/OpenSim/Region/Environment/Scenes/SceneBase.cs
index 51909adebc..955fd222a7 100644
--- a/OpenSim/Region/Environment/Scenes/SceneBase.cs
+++ b/OpenSim/Region/Environment/Scenes/SceneBase.cs
@@ -183,7 +183,7 @@ namespace OpenSim.Region.Environment.Scenes
 
         public virtual string GetSimulatorVersion()
         {
-            return "OpenSimulator v0.5 SVN";
+            return "OpenSimulator Server";
         }
 
         #endregion
diff --git a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api_Base.cs b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api_Base.cs
index 16b4c50b2f..320e87897b 100644
--- a/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api_Base.cs
+++ b/OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api_Base.cs
@@ -7028,7 +7028,7 @@ namespace OpenSim.Region.ScriptEngine.Shared.Api
                         else
                             reply = "UNKNOWN";
                         break;
-                    case 128: // SIM_RELEASE
+                    case 128: // SIM_RELEASE (not LSL conform, valid for OpenSim only)
                         reply = m_ScriptEngine.World.GetSimulatorVersion();
                         break;
                     default: