diff --git a/lam/lib/listhosts.php b/lam/lib/listhosts.php
new file mode 100644
index 00000000..3414c514
--- /dev/null
+++ b/lam/lib/listhosts.php
@@ -0,0 +1,53 @@
+<?php
+/*
+$Id$
+
+  This code is part of LDAP Account Manager (http://www.sourceforge.net/projects/lam)
+  Copyright (C) 2003  Roland Gruber
+
+  This program is free software; you can redistribute it and/or modify
+  it under the terms of the GNU General Public License as published by
+  the Free Software Foundation; either version 2 of the License, or
+  (at your option) any later version.
+  
+  This program is distributed in the hope that it will be useful,
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+  GNU General Public License for more detaexils.
+  
+  You should have received a copy of the GNU General Public License
+  along with this program; if not, write to the Free Software
+  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+  This code displays a list of all Samba hosts.
+  
+*/
+include_once ('../config/config.php');
+include_once("ldap.php");
+@session_start();
+
+echo "<link rel=\"stylesheet\" type=\"text/css\" href=\"../style/layout.css\" />";
+
+// Samba hosts have the attribute "sambaAccount" and end with "$"
+$filter = "(&(objectClass=sambaAccount) (uid=*$))";
+$attrs = array("cn", "rid");
+$sr = ldap_search($_SESSION["ldap"]->server(),
+	$_SESSION["config"]->get_HostSuffix(),
+	$filter, $attrs);
+$info = ldap_get_entries($_SESSION["ldap"]->server, $sr);
+ldap_free_result($sr);
+
+// print host table
+echo "<table width=\"100%\">\n";
+echo "<tr>";
+echo "<th class=\"userlist\">" . _("Host Name") . "</th>";
+echo "<th class=\"userlist\">RID</th>";
+echo "</tr>";
+for ($i = 0; $i < sizeof($info); $i++) {
+	echo("<tr>");
+	echo ("<td class=\"userlist\">" . $info["cn"][$i] . "</td>");
+	echo ("<td class=\"userlist\">" . $info["rid"][$i] . "</td>");
+	echo("</tr>");
+}
+echo ("</table>");
+?>
\ No newline at end of file
diff --git a/lam/templates/main_header.php b/lam/templates/main_header.php
index 9ad2f441..43629049 100644
--- a/lam/templates/main_header.php
+++ b/lam/templates/main_header.php
@@ -39,8 +39,8 @@ $Id$
 		<table border="0" align="center" width="600">
 			<tr>
 				<td width="200"><p align="center"><a href="../lib/listusers.php" target="mainpart"> <? echo _("Users");?> </a></p></td>
-				<td width="200"><p align="center"> <? echo _("Groups") ?> </p></td>
-				<td width="200"><p align="center"> <? echo _("Samba Hosts") ?> </p></td>
+				<td width="200"><p align="center"><a href="../lib/listgroups.php" target="mainpart"> <? echo _("Groups");?> </a></p></td>
+				<td width="200"><p align="center"><a href="../lib/listhosts.php" target="mainpart"> <? echo _("Hosts");?> </a></p></td>
 			</tr>
 		</table>
 	</body>