Index: kernel/setup/info.php
===================================================================
--- kernel/setup/info.php	(revision 23928)
+++ kernel/setup/info.php	(working copy)
@@ -54,26 +54,26 @@
 if ( $info instanceof ezcSystemInfo )
 {
     // Workaround until ezcTemplate is used, as properties can not be accessed directly in ezp templates.
-	$systemInfo = array(
+    $systemInfo = array(
         'cpu_type' => $info->cpuType,
         'cpu_speed' => $info->cpuSpeed,
         'cpu_count' =>$info->cpuCount,
         'memory_size' => $info->memorySize
     );
 
-	if ( $info->phpAccelerator !== null )
-	{
-	    $phpAcceleratorInfo = array(   'name' => $info->phpAccelerator->name,
-	                                   'url' => $info->phpAccelerator->url,
-	                                   'enabled' => $info->phpAccelerator->isEnabled,
-	                                   'version_integer' => $info->phpAccelerator->versionInt,
-	                                   'version_string' => $info->phpAccelerator->versionString
-	    );
-	}
-	else
-	{
-		$phpAcceleratorInfo = array();
-	}
+    if ( $info->phpAccelerator !== null )
+    {
+        $phpAcceleratorInfo = array(   'name' => $info->phpAccelerator->name,
+                                       'url' => $info->phpAccelerator->url,
+                                       'enabled' => $info->phpAccelerator->isEnabled,
+                                       'version_integer' => $info->phpAccelerator->versionInt,
+                                       'version_string' => $info->phpAccelerator->versionString
+        );
+    }
+    else
+    {
+        $phpAcceleratorInfo = array();
+    }
 }
 else
 {
@@ -95,6 +95,17 @@
     if ( function_exists( 'apache_get_modules' ) )
         $webserverInfo['modules'] = apache_get_modules();
 }
+elseif( isset( $_SERVER['SERVER_SOFTWARE'] ) )
+{
+    // $_SERVER['SERVER_SOFTWARE'] = lighttpd/1.4.22 xyz
+    $serverSoftwareExplode = explode( ' ', $_SERVER['SERVER_SOFTWARE'] );
+    $serverSoftwareExplode2 = explode( '/', $serverSoftwareExplode[0] );
+    $serverName = $serverSoftwareExplode2[ 0 ];
+    $serverVersion = $serverSoftwareExplode2[ 1 ];
+    $webserverInfo = array( 'name' => $serverName,
+                            'modules' => false,
+                            'version' => $serverVersion );
+}
 
 $tpl->setVariable( 'ezpublish_version', eZPublishSDK::version() . " (" . eZPublishSDK::alias() . ")" );
 $tpl->setVariable( 'ezpublish_revision', eZPublishSDK::revision() );