Index: Changelog6.html
===================================================================
--- Changelog6.html	(revision 9893)
+++ Changelog6.html	(working copy)
@@ -1,6 +1,14 @@
-<h2><a name="v6.5.x" id="v6.5.x"></a>Version 6.5.x - 2006-MM-DD</h2>
+<h2><a name="v6.5.1" id="v6.5.1"></a>Version 6.5.1 - 2006-MM-DD</h2>
 
 <ul>
+	<li>Bug Fixes:
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4157">#4157</a> - Server IP address should be displayed along with version information on basic server setup pages</li>
+	<ul>
+		<li></li>
+
+<h2><a name="v6.5.0" id="v6.5.0"></a>Version 6.5.0 - 2006-09-19</h2>
+
+<ul>
 	<li>Firmware updates:
 	<ul>
 		<li>Firmware 18 for Transporter.
Index: strings.txt
===================================================================
--- strings.txt	(revision 9893)
+++ strings.txt	(working copy)
@@ -9745,6 +9745,9 @@
 	SV	Ändra
 	ZH_CN	更动
 
+SERVER_IP_ADDRESS
+	EN	Server IP address
+
 PLAYER_IP_ADDRESS
 	CS	IP adresa tohoto přehrávače je:
 	DE	Die IP-Adresse für diesen Player ist:
Index: Slim/Utils/Misc.pm
===================================================================
--- Slim/Utils/Misc.pm	(revision 9893)
+++ Slim/Utils/Misc.pm	(working copy)
@@ -996,6 +996,14 @@
 		Slim::Utils::Unicode::currentLocale(),
 	);
 	
+	my @serverIP = $main::httpaddr || Slim::Utils::Network::hostAddr() || '127.0.0.1';
+	push @diagString, sprintf("%s%s %s",
+	
+		Slim::Utils::Strings::string('SERVER_IP_ADDRESS'),
+		Slim::Utils::Strings::string('COLON'),
+		@serverIP,
+	);
+
 	# Also display the Perl version and MySQL version
 	push @diagString, sprintf("%s%s %s %s",