diff --git a/administrator/components/com_admin/models/sysinfo.php b/administrator/components/com_admin/models/sysinfo.php
index ae47c5695e74f..b0c4262f61fbc 100644
--- a/administrator/components/com_admin/models/sysinfo.php
+++ b/administrator/components/com_admin/models/sysinfo.php
@@ -143,9 +143,10 @@ function &getPHPInfo()
 			$output = preg_replace('#(\w),(\w)#', '\1, \2', $output);
 			$output = preg_replace('#<hr />#', '', $output);
 			$output = str_replace('<div class="center">', '', $output);
-			$output = preg_replace('#<tr class="h">(.*)<\/tr>#', '<thead><tr class="h">$1</tr></thead><tbody>', $output);
-			$output = str_replace('</table>', '</tbody></table>', $output);
+			$output = preg_replace('#<tr class="h">(.*)<\/tr>([ |\r|\n|\t]*)(?>!</table>)#', '<thead><tr class="h">$1</tr>$2</thead><tbody>', $output);
+			$output = preg_replace('#(<tbody>.*?)(?<!</tbody>)([ |\r|\n|\t]*</table>)#', '$1</tbody>$2', $output);
 			$output = str_replace('</div>', '', $output);
+			$output = str_replace("module_Zend Optimizer", "module_Zend_Optimizer", $output);
 			$this->php_info = $output;
 		}
 		return $this->php_info;
diff --git a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php b/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
index ea560cd0f7cfa..0a4981df0d55e 100644
--- a/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
+++ b/administrator/components/com_admin/views/sysinfo/tmpl/default_system.php
@@ -85,6 +85,7 @@
 					<?php echo $this->info['version'];?>
 				</td>
 			</tr>
+			<tr>
 				<td>
 					<strong><?php echo JText::_('COM_ADMIN_PLATFORM_VERSION'); ?></strong>
 				</td>