diff --git a/xemacs.spec b/xemacs.spec
index 0b3d348..d654135 100644
--- a/xemacs.spec
+++ b/xemacs.spec
@@ -1,5 +1,5 @@
 #
-# spec file for package xemacs (Version 21.5.29)
+# spec file for package xemacs (Version 21.5.b604d235f028)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -36,14 +36,14 @@ BuildRequires:  fdupes
 %define _id     b604d235f028
 %define _hg     beta-%{_id}
 Url:            http://www.xemacs.org
-License:        GPL v2 or later
+License:        GPLv2+
 Group:          Productivity/Editors/Emacs
 PreReq:         permissions
 Requires:       xemacs-info xemacs-packages ctags
 Conflicts:      gnuserv
 AutoReqProv:    on
 Version:        21.5.b604d235f028
-Release:        4
+Release:        1
 Summary:        XEmacs
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # Howto get the Mercurial tree of XEmacs:
@@ -112,7 +112,7 @@ Authors:
     and many other contributors
 
 %package     -n xemacs-el
-License:        GPL v2 or later
+License:        GPLv2+
 Requires:       xemacs xemacs-packages-el
 Summary:        Emacs-Lisp source files for XEmacs
 Group:          Productivity/Editors/Emacs
@@ -134,7 +134,7 @@ Authors:
     and many other contributors
 
 %package     -n xemacs-info
-License:        GPL v2 or later
+License:        GPLv2+
 Requires:       xemacs-packages-info
 Summary:        Info Files for XEmacs
 Group:          Productivity/Editors/Emacs