diff --git a/gpm.init b/gpm.init
index 9b646c5..f99f5ce 100755
--- a/gpm.init
+++ b/gpm.init
@@ -11,22 +11,23 @@
 
 # source function library
 . /etc/init.d/functions
+[ -e /etc/sysconfig/gpm ] && . /etc/sysconfig/gpm
 
 MOUSECFG=/etc/sysconfig/mouse
 
 RETVAL=0
 
 start() {
-	echo -n "Starting console mouse services: "
+	echo -n $"Starting console mouse services: "
 	if [ -f "$MOUSECFG" ]; then
 		. "$MOUSECFG"
 	else
-		echo "(no mouse is configured)"
+		echo $"(no mouse is configured)"
 		exit 0
 	fi
 
 	if [ "$MOUSETYPE" = "none" ]; then
-		echo "(no mouse is configured)"
+		echo $"(no mouse is configured)"
 		exit 0
 	fi
 
@@ -35,10 +36,14 @@ start() {
 		MOUSETYPE=ms
 	fi
 
+	if [ -n "$DEVICE" ]; then
+	    DEVICE="/dev/mouse"
+	fi
+
 	if [ -n "$MOUSETYPE" ]; then
-		daemon gpm -t $MOUSETYPE
+		daemon gpm $OPTIONS -t $MOUSETYPE -m $DEVICE
 	else
-		daemon gpm
+		daemon gpm $OPTIONS -m $DEVICE
 	fi
 	RETVAL=$?
 	echo
@@ -46,7 +51,7 @@ start() {
 }
 
 stop() {
-	echo -n "Shutting down console mouse services: "
+	echo -n $"Shutting down console mouse services: "
 	killproc gpm
 	RETVAL=$?
 
@@ -78,7 +83,7 @@ case "$1" in
 	RETVAL=$?
 	;;
   *)
-	echo "Usage: gpm {start|stop|restart|condrestart|status}"
+	echo $"Usage: $0 {start|stop|restart|condrestart|status}"
 	exit 1
 esac
 
diff --git a/gpm.spec b/gpm.spec
index 0922284..4f181a4 100644
--- a/gpm.spec
+++ b/gpm.spec
@@ -1,7 +1,7 @@
 Summary: A mouse server for the Linux console.
 Name: gpm
 Version: 1.19.3
-Release: 4
+Release: 16
 License: GPL
 Group: System Environment/Daemons
 Source: ftp://ftp.systemy.it/pub/develop/%{name}-%{version}.tar.gz
@@ -12,8 +12,12 @@ Patch3: gpm-1.19.3-root.patch
 Patch4: gpm-root.patch
 Patch5: gpm-1.19.1-secenhance.patch
 Patch6: gpm-1.19.2-limits.patch 
-Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info /etc/init.d
-Requires: pam >= 0.72-22
+Patch7: gpm-1.19.3-serialconsole.patch
+Patch8: gpm-1.19.3-devfs.patch
+Patch9: gpm-1.19.3-noworldwrite.patch
+
+Prereq: /sbin/chkconfig /sbin/ldconfig /sbin/install-info
+Requires: pam >= 0.72-22 bash >= 2.0
 # this defines the library version that this package builds.
 %define LIBVER 1.18.0
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
@@ -25,21 +29,19 @@ also provides console cut-and-paste operations using the mouse and
 includes a program to allow pop-up menus to appear at the click of a
 mouse button.
 
-Gpm should be installed if you intend to use a mouse with your Red Hat
-Linux system.
 
 %package devel
-Requires: gpm
-Summary: Libraries and header files for developing mouse driven programs.
-Group: Development/Libraries
+Requires: %{name} = %{version}
+Summary: A mouse server for the Linux console.
+Group: System Environment/Daemons
 
 %description devel
-The gpm-devel program contains the libraries and header files needed
-for the development of mouse driven programs for the console.  This
-package allows you to develop text-mode programs which use the mouse.
+Gpm provides mouse support to text-based Linux applications like the
+Emacs editor and the Midnight Commander file management system.  Gpm
+also provides console cut-and-paste operations using the mouse and
+includes a program to allow pop-up menus to appear at the click of a
+mouse button.
 
-Install gpm-devel if you need to develop text-mode programs which will
-use the mouse.  You'll also need to install the gpm package.
 
 %prep
 %setup -q
@@ -49,6 +51,9 @@ use the mouse.  You'll also need to install the gpm package.
 %patch4 -p1 -b .root
 %patch5 -p1 -b .secenhance
 %patch6 -p1 -b .limits
+%patch7 -p1 -b .serialconsole
+%patch8 -p1 -b .devfs
+%patch9 -p1 -b .noworldwrite
 
 %build
 autoconf
@@ -83,6 +88,13 @@ cp t-mouse.el* %{buildroot}%{_datadir}/emacs/site-lisp
 mkdir -p %{buildroot}%{_sysconfdir}/rc.d/init.d  
 install -m 755 $RPM_SOURCE_DIR/gpm.init %{buildroot}%{_sysconfdir}/rc.d/init.d/gpm
 
+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/mouse"
+EOF
+
 %clean
 rm -rf %{buildroot}
 
@@ -120,6 +132,7 @@ fi
 %{_mandir}/man8/gpm.8*
 %{_libdir}/libgpm.so.%{LIBVER}
 %config %{_sysconfdir}/rc.d/init.d/gpm
+%config %{_sysconfdir}/sysconfig/gpm
 
 %files devel
 %defattr(-,root,root)
@@ -128,6 +141,44 @@ fi
 %{_libdir}/libgpm.so
 
 %changelog
+* Fri Apr  6 2001 Preston Brown <pbrown@redhat.com>
+- work better with unsupported devfs (#23500, #34883)
+
+* Mon Feb 05 2001 Karsten Hopp <karsten@redhat.de>
+- found another bug: tmpfile was never removed if
+  gpm was already running
+
+* Mon Feb 05 2001 Karsten Hopp <karsten@redhat.de>
+- really fix tmpfile path
+
+* Mon Feb 05 2001 Karsten Hopp <karsten@redhat.de>
+- fix tmpfile path (bugzilla  #25967)
+
+* Tue Jan 30 2001 Preston Brown <pbrown@redhat.com>
+- don't make PID file world-writable.
+
+* Mon Jan 29 2001 Preston Brown <pbrown@redhat.com>
+- fix up devel dependency on main package
+
+* Sun Jan 28 2001 Bernhard Rosenkraenzer <bero@redhat.com>
+- Don't crash if we can't open /dev/console
+  (Happens with some devfs enabled kernels)
+
+* Tue Jan 23 2001 Trond Eivind Glomsrød <teg@redhat.com>
+- fix bug in i18n of initscript
+
+* Tue Jan 23 2001 Preston Brown <pbrown@redhat.com>
+- bash2 style of i18n for initscript
+
+* Wed Jan 17 2001 Preston Brown <pbrown@redhat.com>
+- i18n the initscript.
+
+* Thu Jan 11 2001 Bernhard Rosenkraenzer <bero@redhat.com>
+- Add hooks for extra options in /etc/sysconfig/gpm (#23547)
+
+* Fri Jan 05 2001 Preston Brown <pbrown@redhat.com>
+- patch added to abort if running on a serial console (#15784)
+
 * Fri Jul 28 2000 Preston Brown <pbrown@redhat.com>
 - cleaned up post section