diff --git a/.cvsignore b/.cvsignore
index 1b12ab7..e4d79e7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1,2 @@
 gpm-1.20.1.tar.gz
+gpm.rc
diff --git a/gpm-1.20.1-consolename.patch b/gpm-1.20.1-consolename.patch
new file mode 100644
index 0000000..e69de29
diff --git a/gpm.init b/gpm.init
index 2dfecf4..6aa24ce 100755
--- a/gpm.init
+++ b/gpm.init
@@ -12,22 +12,21 @@
 # source function library
 . /etc/init.d/functions
 
-if test -e /etc/sysconfig/gpm ; then
-    . /etc/sysconfig/gpm
-    MOUSECFG=/etc/sysconfig/gpm
-fi
 if test -e /etc/sysconfig/mouse ; then
     . /etc/sysconfig/mouse
-    MOUSECFG=/etc/sysconfig/mouse
 fi
 
 RETVAL=0
 
 start() {
 	echo -n $"Starting console mouse services: "
-	if [ -z "$MOUSECFG" ]; then
-		echo $"(no mouse is configured)"
-		exit 0
+
+	if [ -z "$MOUSETYPE" ]; then
+	    DEVICE="/dev/input/mice"
+	fi
+
+	if [ -z "$DEVICE" ]; then
+	    DEVICE="/dev/input/mice"
 	fi
 
 	if [ "$MOUSETYPE" = "none" ]; then
@@ -35,15 +34,10 @@ start() {
 		exit 0
 	fi
 
-
 	if [ "$MOUSETYPE" = "Microsoft" ]; then
 		MOUSETYPE=ms
 	fi
 
-	if [ -z "$DEVICE" ]; then
-	    DEVICE="/dev/input/mice"
-	fi
-	
 	if [ -n "$IMOUSETYPE" ]; then
 		modprobe sermouse > /dev/null 2>&1
 		/usr/sbin/inputattach -$IMOUSETYPE $DEVICE --daemon
diff --git a/gpm.spec b/gpm.spec
index 1478937..b31e884 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -5,7 +5,7 @@ Release: 59
 License: GPL
 Group: System Environment/Daemons
 Source: http://ftp.linux.it/pub/People/rubini/gpm/%{name}-%{version}.tar.gz
-Source1: gpm.init
+Source1: gpm.rc
 Source2: inputattach.c
 Patch1: gpm-evdev-cumulative.patch
 Patch2: gpm-1.20.1-math.patch
@@ -15,6 +15,7 @@ Patch5: gpm-1.20.1-gpmopen.patch
 Patch6: gpm-1.20.1-idie.patch
 Patch16: gpm-1.20.1-subscript.patch
 Patch17: gpm-1.20.1-input.patch
+Patch18: gpm-1.20.1-consolename.patch
 
 Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info
 Requires: bash >= 2.0
@@ -54,6 +55,7 @@ mouse button.
 %patch6 -p1 -b .idie
 %patch16 -p1 -b .subscript
 %patch17 -p1 -b .input
+%patch18 -p1 -b .consolename
 
 %build
 autoconf
@@ -94,16 +96,16 @@ cp contrib/emacs/t-mouse.el* %{buildroot}%{_datadir}/emacs/site-lisp
 
 %ifnarch s390 s390x
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d  
-install -m 755 $RPM_SOURCE_DIR/gpm.init %{buildroot}%{_sysconfdir}/rc.d/init.d/gpm
+install -m 755 %{SOURCE1} %{buildroot}%{_sysconfdir}/rc.d/init.d/gpm
 %endif
 
 mkdir -p $RPM_BUILD_ROOT/etc/sysconfig
-cat >$RPM_BUILD_ROOT/etc/sysconfig/gpm <<EOF
-# Additional options for gpm (e.g. acceleration), device
-OPTIONS=""
-DEVICE="/dev/input/mice"
-MOUSETYPE="exps2"
-EOF
+#cat >$RPM_BUILD_ROOT/etc/sysconfig/gpm <<EOF
+## Additional options for gpm (e.g. acceleration), device
+#OPTIONS=""
+#DEVICE="/dev/input/mice"
+#MOUSETYPE="exps2"
+#EOF
 
 # remove stuff from the buildroot that we aren't shipping
 rm -f $RPM_BUILD_ROOT%{_bindir}/disable-paste
@@ -162,7 +164,6 @@ fi
 %{_datadir}/emacs/site-lisp/t-mouse.el*
 %{_infodir}/gpm.info*
 %{_libdir}/libgpm.so.*
-%config %{_sysconfdir}/sysconfig/gpm
 
 %files devel
 %defattr(-,root,root)
@@ -173,6 +174,8 @@ fi
 %changelog
 * Wed Oct 13 2004 Adrian Havill <havill@redhat.com> 1.20.1-59
 - remove unnecessary diagnostic and check of the consolename (#129962)
+- remove /etc/sysconfig/gpm; set unset defaults in the init script instead
+  after mousecfg is (or is not) read
 
 * Wed Oct 13 2004 Florian La Roche <laroche@redhat.com>
 - sysconfig/gpm should probably go away, that is more confusing than
diff --git a/sources b/sources
index 0109447..652ba12 100644
--- a/sources
+++ b/sources
@@ -1 +1,2 @@
 632a8fa8a6613027e407ee3e7a54cf13  gpm-1.20.1.tar.gz
+40236b42e189c25f630d3a5eab3ce90d  gpm.rc