diff --git a/site-start.el b/site-start.el
index 996c6f5..9aa781b 100644
--- a/site-start.el
+++ b/site-start.el
@@ -17,6 +17,12 @@
 (load "/usr/lib/ispell/ispell-emacs-menu.el" t t)
 (load "fix-load-history.el" t t)
 
+;;
+;; Enable mouse wheel support
+;;
+
+(mwheel-install)
+
 ;;
 ;; i18n setup (encoding, language-environment, ...)
 ;; -------------------------------------------------
diff --git a/xemacs.changes b/xemacs.changes
index 47e93d1..4f2da78 100644
--- a/xemacs.changes
+++ b/xemacs.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Sep 04 12:52:19 CEST 2007 - mfabian@suse.de
+
+- Bugzilla #307313: use (mwheel-install) to enable mouse wheel
+  support and remove the old hacks for mouse wheel support from
+  /usr/share/xemacs/site-packages/lisp/term/func-keys.el.
+
 -------------------------------------------------------------------
 Mon Aug 27 15:25:01 CEST 2007 - mfabian@suse.de
 
diff --git a/xemacs.patch b/xemacs.patch
index b86e46f..065bfa2 100644
--- a/xemacs.patch
+++ b/xemacs.patch
@@ -277,7 +277,7 @@ diff -Nru xemacs-21.5.20.orig/lisp/x-win-xfree86.el xemacs-21.5.20/lisp/x-win-xf
 diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/func-keys.el xemacs-21.5.20/site-packages/lisp/term/func-keys.el
 --- xemacs-21.5.20.orig/site-packages/lisp/term/func-keys.el	1970-01-01 01:00:00.000000000 +0100
 +++ xemacs-21.5.20/site-packages/lisp/term/func-keys.el	2005-05-12 14:38:20.000000000 +0200
-@@ -0,0 +1,129 @@
+@@ -0,0 +1,101 @@
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
 +;;; term/func-keys.el for site-lisp path in xemacs-21.4.12
 +;;; Copyright (c) 1996-2003 SuSE Gmbh Nuernberg, Germany
@@ -377,36 +377,8 @@ diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/func-keys.el xemacs-21.5.2
 +(global-set-key [(end)]             'end-of-line)
 +(global-set-key [(control end)]     'end-of-buffer)
 +;;
-+;; Wheel mouse support
-+;;
-+(defvar mouse-wheel-scroll-amount 4
-+    "*Number of lines to scroll per click of the mouse wheel.")
-+;
-+(defun mouse-wheel-scroll-line (event)
-+    "Scroll the current buffer by `mouse-wheel-scroll-amount'."
-+    (interactive "e")
-+    (condition-case nil
-+	(case (event-button event)
-+	     (4 (scroll-down mouse-wheel-scroll-amount))
-+	     (5 (scroll-up   mouse-wheel-scroll-amount)))
-+    (error nil)))
-+;
-+(defun mouse-wheel-scroll-screen (event)
-+    "Scroll the current buffer."
-+    (interactive "e")
-+    (condition-case nil
-+	(case (event-button event)
-+	     (4 (scroll-down))
-+	     (5 (scroll-up)))
-+    (error nil)))
-+;
-+(global-set-key [(button4)]         'mouse-wheel-scroll-line)
-+(global-set-key [(control button4)] 'mouse-wheel-scroll-screen)
-+(global-set-key [(button5)]         'mouse-wheel-scroll-line)
-+(global-set-key [(control button5)] 'mouse-wheel-scroll-screen)
-+;;
 +;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
-+;; Ende von func-keys.el
++;; End of func-keys.el
 diff -Nru xemacs-21.5.20.orig/site-packages/lisp/term/gnome.el xemacs-21.5.20/site-packages/lisp/term/gnome.el
 --- xemacs-21.5.20.orig/site-packages/lisp/term/gnome.el	1970-01-01 01:00:00.000000000 +0100
 +++ xemacs-21.5.20/site-packages/lisp/term/gnome.el	2005-05-12 14:38:20.000000000 +0200
diff --git a/xemacs.spec b/xemacs.spec
index 114dc30..f875061 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -37,7 +37,7 @@ Requires:       xemacs-info xemacs-packages ctags
 Conflicts:      gnuserv
 Autoreqprov:    on
 Version:        21.5.28.20070807
-Release:        12
+Release:        16
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the cvs tree of XEmacs:
@@ -581,6 +581,10 @@ rm -rf $RPM_BUILD_ROOT
 %dir /usr/share/xemacs/site-packages/lisp/term/
 
 %changelog
+* Tue Sep 04 2007 - mfabian@suse.de
+- Bugzilla #307313: use (mwheel-install) to enable mouse wheel
+  support and remove the old hacks for mouse wheel support from
+  /usr/share/xemacs/site-packages/lisp/term/func-keys.el.
 * Mon Aug 27 2007 - mfabian@suse.de
 - Bugzilla #299941: don’t use the obsolete GNU Emacs icon, use
   an XEmacs specific icon instead.