diff --git a/xscreensaver-5.00-ja.po b/xscreensaver-5.00-ja.po
index f3cd9c7..6b045c1 100644
--- a/xscreensaver-5.00-ja.po
+++ b/xscreensaver-5.00-ja.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: xscreensaver 5.00-6\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2006-02-13 12:26+0100\n"
-"PO-Revision-Date: 2006-06-07 09:09+0900\n"
+"PO-Revision-Date: 2006-06-28 00:51+0900\n"
 "Former-Translator: Takeshi Aihana <aihana@gnome.gr.jp>\n"
 "Last-Translator:  Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>\n"
 "Language-Team: Japanese <translation@gnome.gr.jp>\n"
@@ -969,7 +969,7 @@ msgstr "表示モード"
 
 #: driver/xscreensaver-demo.glade2.h:86
 msgid "_Host Name and Time"
-msgstr "ホスト名と日時"
+msgstr "ホスト名と日時(_H)"
 
 #: driver/xscreensaver-demo.glade2.h:88
 msgid "_Lock Screen After  "
diff --git a/xscreensaver-5.00-noseguy-cpueat.patch b/xscreensaver-5.00-noseguy-cpueat.patch
new file mode 100644
index 0000000..4050b24
--- /dev/null
+++ b/xscreensaver-5.00-noseguy-cpueat.patch
@@ -0,0 +1,30 @@
+--- xscreensaver-5.00/hacks/noseguy.c.cpueat	2006-03-17 08:13:56.000000000 +0900
++++ xscreensaver-5.00/hacks/noseguy.c	2006-06-28 00:48:11.000000000 +0900
+@@ -196,6 +196,17 @@
+ 		st->move_length = st->Width / 100 + random() % 90, tries = 8;
+ 	    else
+ 		tries--;
++	    /* There maybe the case that we won't be able to exit from
++	       this routine (especially when the geometry is too small)!!
++
++	       Ensure that we can exit from this routine.
++	     */
++#if 1
++	    if (!tries && (st->move_length <= 1)) {
++	      st->move_length = 1;
++	      break;
++	    }
++#endif
+ 	    switch (random() % 8)
+ 	    {
+ 	    case 0:
+@@ -239,7 +250,8 @@
+ 	    }
+ 	} while (!st->move_dir);
+     }
+-    walk(st, st->move_dir);
++    if (st->move_dir)
++      walk(st, st->move_dir);
+     --st->move_length;
+     st->next_fn = move;
+ }
diff --git a/xscreensaver.spec b/xscreensaver.spec
index e3588de..4caa869 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -1,12 +1,13 @@
 %define	name 		xscreensaver
 
 %define version		5.00
-%define fedora_rel	8
+%define fedora_rel	9
 
 %define fedora_ver	5.90
 %define default_text 	%{_datadir}/doc/fedora-release-%{fedora_ver}/eula.txt
 
 %define pam_ver		0.80-7
+%define autoconf_ver	2.53
 
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
@@ -28,13 +29,14 @@ Patch101:	xscreensaver-5.00-localefix-restrict.patch
 Patch102:	xscreensaver-5.00-matherr-utils.patch
 Patch104:	xscreensaver-5.00-xmlmanfix.patch
 Patch105:	xscreensaver-5.00-text-locale.patch
+Patch106:	xscreensaver-5.00-noseguy-cpueat.patch
 
 %package base
 Summary: 	A minimal installation of xscreensaver
 Group: 		Amusements/Graphics
 BuildRequires:	gettext
 BuildRequires:  desktop-file-utils
-BuildRequires:	autoconf >= 2.53
+BuildRequires:	autoconf >= %{autoconf_ver}
 BuildRequires:	sed
 BuildRequires:	libtool
 BuildRequires: 	bc
@@ -50,7 +52,7 @@ BuildRequires: 	libXxf86vm-devel
 BuildRequires: 	libjpeg-devel
 BuildRequires: 	gtk2-devel libglade2-devel
 Requires:       fedora-release
-Requires: 	/etc/pam.d/system-auth, htmlview
+Requires: 	/etc/pam.d/system-auth
 Requires:	pam > %{pam_ver}
 Provides: 	xscreensaver = %{epoch}:%{version}-%{release}
 Obsoletes: 	xscreensaver
@@ -100,6 +102,7 @@ hypnotized viewing pleasure.
 %patch102 -p1 -b .matherr2
 %patch104 -p1 -b .xmlfix
 %patch105 -p1 -b .text-locale
+%patch106 -p1 -b .noseguy-cpueat
 
 install -c -m644 -p %{SOURCE10} po/ja.po
 
@@ -283,6 +286,11 @@ rm -rf ${RPM_BUILD_ROOT}
 %defattr(-,root,root)
 
 %changelog
+* Thu Jun 27 2006 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.00-9
+- Don't make xscreensaver-base require htmlview.
+- Update ja.po again.
+- Fix noseguy not to eat cpu when geometry is too small.
+
 * Fri Jun 23 2006 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.00-8
 - Spec file script change.
 - Add libtool to BuildRequires.