diff --git a/README.SUSE b/README.SUSE
index f21036c..6f25c7a 100644
--- a/README.SUSE
+++ b/README.SUSE
@@ -20,7 +20,7 @@ And two additional packages:
   want to manage shutdown of more computers sharing the same UPS).
 
 - nut-cgi provides support for monitoring UPS web pages using apache web
-  browser.
+  browser. Predefined address is http://localhost/nut/index.html
 
 nut-hal Configuration
 
@@ -54,7 +54,7 @@ It requires only few adoptions before you can start the service:
 	- Go to the [myups] section at the end of the file.
 	- Set driver key to the driver name supporting your UPS.
 	  (see /usr/lib/ups/driver/ for possible drivers. Each driver
-	  has a man page. Many USB UPSes are hidups.)
+	  has a man page. Many USB UPSes are usbhid-ups.)
 	- Set port key to the device your UPS is connected to,
 	  e.g. /dev/ttyS0 for first serial port (COM1) or /dev/hiddev0
 	  for USB HID UPS.
diff --git a/nut.changes b/nut.changes
index 4a1ad0b..a1db553 100644
--- a/nut.changes
+++ b/nut.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed May 28 15:56:12 CEST 2008 - sbrabec@suse.cz
+
+- nut-cgi: Fixed and documented URLs (bnc#354388#c10).
+- README.SUSE: Fixed name of the most common USB HID driver.
+
 -------------------------------------------------------------------
 Mon May 26 15:09:50 CEST 2008 - sbrabec@suse.cz
 
diff --git a/nut.spec b/nut.spec
index df6652a..cd08de4 100644
--- a/nut.spec
+++ b/nut.spec
@@ -21,7 +21,7 @@ Obsoletes:      smartups
 Conflicts:      apcupsd
 Summary:        Network UPS Tools Core (Unbreakable Power Supply Monitoring)
 Version:        2.2.2
-Release:        7
+Release:        9
 Url:            http://www.networkupstools.org/
 Source:         %{name}-%{version}.tar.bz2
 Source1:        upsd.init
@@ -367,6 +367,8 @@ Provides:       nut:/srv/www/cgi-bin/upsstats.cgi
 %description cgi
 Web server support package for the Network UPS Tools.
 
+Predefined URL is http://localhost/nut/index.html
+
 Network UPS Tools is a collection of programs which provide a common
 interface for monitoring and administering UPS hardware.
 
@@ -518,10 +520,9 @@ install -m 644 20-nut-disable-hal-hid-ups.fdi $RPM_BUILD_ROOT%{_datadir}/hal/fdi
 mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/pm/sleep.d
 install nut.sleep $RPM_BUILD_ROOT%{_sysconfdir}/pm/sleep.d/80nut
 # Rename web pages to not conflict with apache2-example-pages or user home page:
-mv $RPM_BUILD_ROOT%{HTMLPATH}/index.html $RPM_BUILD_ROOT%{HTMLPATH}/ups.html
-mv $RPM_BUILD_ROOT%{HTMLPATH}/header.html $RPM_BUILD_ROOT%{HTMLPATH}/ups_header.html
-mv $RPM_BUILD_ROOT%{HTMLPATH}/bottom.html $RPM_BUILD_ROOT%{HTMLPATH}/ups_bottom.html
-sed -i 's/\(header\|bottom\)/ups_&/g' $RPM_BUILD_ROOT%{HTMLPATH}/ups.html
+mkdir $RPM_BUILD_ROOT%{HTMLPATH}/nut $RPM_BUILD_ROOT%{CGIPATH}/nut
+mv $RPM_BUILD_ROOT%{HTMLPATH}/*.{html,png} $RPM_BUILD_ROOT%{HTMLPATH}/nut/
+mv $RPM_BUILD_ROOT%{CGIPATH}/*.cgi $RPM_BUILD_ROOT%{CGIPATH}/nut
 
 %pre
 usr/sbin/useradd -r -o -g %{GROUP} -s /bin/false \
@@ -637,9 +638,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %files cgi
 %defattr(-,root,root)
-%{CGIPATH}/*.cgi
-%{HTMLPATH}/*.html
-%{HTMLPATH}/*.png
+%{CGIPATH}/nut
+%{HTMLPATH}/nut
 %config(noreplace) %{CONFPATH}/upsstats-single.html
 %config(noreplace) %{CONFPATH}/upsstats.html
 
@@ -657,6 +657,9 @@ rm -rf $RPM_BUILD_ROOT
 %doc %{_mandir}/man3/*.*
 
 %changelog
+* Wed May 28 2008 sbrabec@suse.cz
+- nut-cgi: Fixed and documented URLs (bnc#354388#c10).
+- README.SUSE: Fixed name of the most common USB HID driver.
 * Mon May 26 2008 sbrabec@suse.cz
 - Provide and Require nut-package (bnc#337059#c3).
 * Fri May 09 2008 sbrabec@suse.cz