diff --git a/src/Acme/Serve/Serve.java b/src/Acme/Serve/Serve.java
index ec00980e..c72ccbc3 100644
--- a/src/Acme/Serve/Serve.java
+++ b/src/Acme/Serve/Serve.java
@@ -457,7 +457,7 @@ public class Serve implements ServletContext, Runnable
     // Same as the CGI variable SERVER_SOFTWARE.
     public String getServerInfo()
 	{
-	return helma.main.Server.version + " (" + ServeUtils.serverUrl + ")";
+	return  ServeUtils.serverName + " " + helma.main.Server.version + " (" + ServeUtils.serverUrl + ")";
 	}
 
     /// Returns the value of the named attribute of the network service, or
@@ -684,7 +684,7 @@ class ServeConnection implements Runnable, HttpServletRequest, HttpServletRespon
 	setStatus( SC_OK );
 	setDateHeader( "Date", System.currentTimeMillis() );
 	setHeader(
-	    "Server", helma.main.Server.version );
+	    "Server", ServeUtils.serverName + "/" + helma.main.Server.version );
 	setHeader( "Connection", "close" );
 	try
 	    {
diff --git a/src/Acme/Serve/ServeUtils.java b/src/Acme/Serve/ServeUtils.java
index e7c11b36..d1c73264 100644
--- a/src/Acme/Serve/ServeUtils.java
+++ b/src/Acme/Serve/ServeUtils.java
@@ -42,9 +42,9 @@ public class ServeUtils
     {
 
     // Server identification.
-    // public static final String serverName = "Helma";
-    // public static final String serverVersion = "1.2 p1";
+     public static final String serverName = "Helma";
     // we're using the server version from helma.main.Server class.
+    // public static final String serverVersion = "1.2 p1";
     public static final String serverUrl = "http://helma.org/";
 
     /// Write a standard-format HTML address for this server.
@@ -53,7 +53,7 @@ public class ServeUtils
 	PrintStream p = new PrintStream( o );
 	p.println(
 	    "<ADDRESS><A HREF=\"" + serverUrl + "\">" +
-	    helma.main.Server.version + "</A></ADDRESS>" );
+	    serverName + " " + helma.main.Server.version + "</A></ADDRESS>" );
 	}