diff --git a/xscreensaver-5.03-demo-conf-maxvalue-plus1.patch b/xscreensaver-5.03-demo-conf-maxvalue-plus1.patch
new file mode 100644
index 0000000..e1facc8
--- /dev/null
+++ b/xscreensaver-5.03-demo-conf-maxvalue-plus1.patch
@@ -0,0 +1,21 @@
+--- xscreensaver-5.03/driver/demo-Gtk-conf.c.debug	2006-05-24 07:02:11.000000000 +0900
++++ xscreensaver-5.03/driver/demo-Gtk-conf.c	2007-10-06 22:36:55.000000000 +0900
+@@ -749,6 +749,7 @@
+                  : p->value);
+   gfloat si = (p->high - p->low) / 100;
+   gfloat pi = (p->high - p->low) / 10;
++  gfloat page_size = ((p->type == SLIDER) ? 1 : 0);
+ 
+   if (p->value < p->low || p->value > p->high)
+     {
+@@ -786,8 +787,8 @@
+ 
+   return GTK_ADJUSTMENT (gtk_adjustment_new (value,
+                                              p->low,
+-                                             p->high + 1,
+-                                             si, pi, 1));
++                                             p->high + page_size,
++                                             si, pi, page_size));
+ }
+ 
+ 
diff --git a/xscreensaver.spec b/xscreensaver.spec
index 1f17a73..a0cca65 100644
--- a/xscreensaver.spec
+++ b/xscreensaver.spec
@@ -7,7 +7,7 @@
 %define fedora_rel    1.1
 %else
 %define modular_conf  1
-%define fedora_rel    9
+%define fedora_rel    10
 %endif
 
 %define extrarel      %{nil}
@@ -38,6 +38,7 @@ Source10:        update-xscreensaver-hacks
 Patch1:          xscreensaver-5.00b5-sanitize-hacks.patch
 Patch21:         xscreensaver-5.03-webcollage-default-nonet.patch
 Patch40:         xscreensaver-5.02-pidnumber-write_long.patch
+Patch41:         xscreensaver-5.03-demo-conf-maxvalue-plus1.patch
 Requires:        xscreensaver-base = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-extras = %{epoch}:%{version}-%{release}
 Requires:        xscreensaver-gl-extras = %{epoch}:%{version}-%{release}
@@ -169,6 +170,7 @@ for gnome-screensaver compatibility.
 %patch1 -p1 -b .sanitize-hacks
 %patch21 -p1 -b .nonet
 %patch40 -p1 -b .pidnum_debug
+%patch41 -p1 -b .conf_max
 
 change_option(){
    set +x
@@ -206,6 +208,16 @@ silence_hack(){
    set -x
 }
 
+# change some files to UTF-8
+for f in \
+   driver/XScreenSaver.ad.in \
+   hacks/glx/sproingies.man \
+   ; do
+   iconv -f ISO-8859-1 -t UTF-8 $f > $f.tmp || cp -p $f $f.tmp
+   touch -r $f $f.tmp
+   mv $f.tmp $f
+done
+
 # change some options
 change_option driver/XScreenSaver.ad.in \
    captureStderr=False \
@@ -517,6 +529,10 @@ exit 0
 %defattr(-,root,root,-)
 
 %changelog
+* Sat Oct  6 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.03-10
+- Fix the maximum value on demo configuration dialog
+- Change the encoding of XScreenSaver.ad and man files
+
 * Tue Oct  2 2007 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 1:5.03-9
 - Change the default browser to xdg-open
 - Don't mark XScreenSaver.ad as %%config. This file is overwritten