diff --git a/mailx.spec b/mailx.spec
index 4090f5f..b2b95c8 100644
--- a/mailx.spec
+++ b/mailx.spec
@@ -1,25 +1,33 @@
 #
 # spec file for package mailx (Version 12.2)
 #
-# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
-# This file and all modifications and additions to the pristine
-# package are under the same license as the package itself.
+# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
+# All modifications and additions to the file contributed by third parties
+# remain the property of their copyright owners, unless otherwise agreed
+# upon. The license for this file, and modifications and additions to the
+# file, is the same license as for the pristine package itself (unless the
+# license for the pristine package is not an Open Source License, in which
+# case the license is the MIT License). An "Open Source License" is a
+# license that conforms to the Open Source Definition (Version 1.9)
+# published by the Open Source Initiative.
+
 # Please submit bugfixes or comments via http://bugs.opensuse.org/
 #
 
 # norootforbuild
 
+
 Name:           mailx
 BuildRequires:  krb5-devel openssl-devel pcre postfix
-URL:            http://heirloom.sourceforge.net/mailx.html
-License:        BSD License and BSD-like
+Url:            http://heirloom.sourceforge.net/mailx.html
+License:        BSD 3-Clause
 Group:          Productivity/Networking/Email/Utilities
 Provides:       mail
 Requires:       smtp_daemon
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        12.2
-Release:        1
+Release:        141
 Summary:        A MIME-Capable Implementation of the mailx Command
 Source:         mailx-%{version}.tar.bz2
 Patch:          mailx-%{version}.dif
@@ -72,6 +80,9 @@ Authors:
     install -m 0644 mail.rc ${RPM_BUILD_ROOT}/etc
     mkdir -p ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}
 
+%clean
+    rm -rf $RPM_BUILD_ROOT
+
 %files
 %defattr(-,root,root)
 %doc COPYING README manual.ps.gz nail.rc
@@ -85,100 +96,100 @@ Authors:
 %doc %{_mandir}/man1/mailx.1.gz
 
 %changelog
-* Tue Apr 17 2007 - werner@suse.de
+* Tue Apr 17 2007 werner@suse.de
 - Update to heirloom mailx 12.2
 - Add UTF-8 detection (bug #262658)
 - Do not convert text attachments to terminal charset but send
   character set (bug #262658)
 - Improve the  support of text/ MIME types other than text/plain
   (bug #262658)
-* Wed Nov 15 2006 - werner@suse.de
+* Wed Nov 15 2006 werner@suse.de
 - Do not send the mail to a reply-to address (bug #218447)
-* Wed Sep 27 2006 - werner@suse.de
+* Wed Sep 27 2006 werner@suse.de
 - Avoid to feed empty strings into mime if empty results leads
   to an error like it does for an empty ORGANIZATION variable
-* Thu Jul 20 2006 - werner@suse.de
+* Thu Jul 20 2006 werner@suse.de
 - Update to mailx version 12.1 the successor of nail
   * Better handling of base64 encoding
   * Support for SendmailX
 - Add a workaround for Ctrl-H used in kernel messages (#189974)
 - Do not convert 8bit encodings to ASCII but use quoted printable
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Fri Jan 20 2006 - schwab@suse.de
+* Fri Jan 20 2006 schwab@suse.de
 - Don't strip binaries.
-* Mon Oct 17 2005 - werner@suse.de
+* Mon Oct 17 2005 werner@suse.de
 - Update to nail 11.25
   * Port all out patches to this version
   * Use dummy option for the reply-to patch because the double
   colon feature of the glibc's getopt does not work
   * New: ssl and krb5 support
-* Mon Aug 30 2004 - werner@suse.de
+* Mon Aug 30 2004 werner@suse.de
 - Update to bugfix release 11.4
-* Thu Aug 19 2004 - werner@suse.de
+* Thu Aug 19 2004 werner@suse.de
 - Make it option compatible with old mail program
 - Update to 11.3
-* Tue Aug 17 2004 - werner@suse.de
+* Tue Aug 17 2004 werner@suse.de
 - Update to 11.2
-* Fri Mar 26 2004 - mmj@suse.de
+* Fri Mar 26 2004 mmj@suse.de
 - Add postfix to # neededforbuild
-* Sat Jan 10 2004 - adrian@suse.de
+* Sat Jan 10 2004 adrian@suse.de
 - add %%defattr
-* Mon Dec 08 2003 - werner@suse.de
+* Mon Dec 08 2003 werner@suse.de
 - Update to version 10.6
-* Tue Nov 11 2003 - werner@suse.de
+* Tue Nov 11 2003 werner@suse.de
 - Fix handling of multiword e-mail addresses (bug #32115)
-* Wed Jul 30 2003 - werner@suse.de
+* Wed Jul 30 2003 werner@suse.de
 - Use charset of locale as default encoding if not set
-* Wed Jul 02 2003 - ro@suse.de
+* Wed Jul 02 2003 ro@suse.de
 - added symlink /usr/bin/mail (again)
-* Wed Jul 02 2003 - werner@suse.de
+* Wed Jul 02 2003 werner@suse.de
 - Update to nail 10.5
-* Thu Feb 27 2003 - werner@suse.de
+* Thu Feb 27 2003 werner@suse.de
 - Fix replyto patch for Replay and replay case
-* Mon Feb 03 2003 - werner@suse.de
+* Mon Feb 03 2003 werner@suse.de
 - Don't eat option id `+' isn't used anymore
 - Accept comma seperated `to' list on command line
-* Mon Jan 27 2003 - sf@suse.de
+* Mon Jan 27 2003 sf@suse.de
 - removed '+' from optarg string to be able to mix
   argument order
-* Thu Dec 19 2002 - werner@suse.de
+* Thu Dec 19 2002 werner@suse.de
 - Move from mail-8.1.1 to nail-10.3 due of getting RFC 2046
 - Port the reply-to patch to nail-10.3 in extension to replyto
   variable of nail configuration
-* Thu Mar 07 2002 - werner@suse.de
+* Thu Mar 07 2002 werner@suse.de
 - Include, enhance and test the reply-to patch from poc@pocnet.net.
   Useful for system notify mails behind firewalls or from header
   rewrite because those mails arn't uniq without reply address.
-* Sat May 12 2001 - schwab@suse.de
+* Sat May 12 2001 schwab@suse.de
 - Fix missing declarations.
-* Wed Nov 22 2000 - werner@suse.de
+* Wed Nov 22 2000 werner@suse.de
 - Allow `/' within valid mail addresses
 - Strip leading + of file name on command line
-* Fri Oct 06 2000 - kukuk@suse.de
+* Fri Oct 06 2000 kukuk@suse.de
 - change group tag
-* Wed May 24 2000 - uli@suse.de
+* Wed May 24 2000 uli@suse.de
 - moved docs to /usr/share
-* Sat Feb 26 2000 - kukuk@suse.de
+* Sun Feb 27 2000 kukuk@suse.de
 - Move /usr/man -> /usr/share/man
-* Mon Sep 20 1999 - ro@suse.de
+* Mon Sep 20 1999 ro@suse.de
 - added requires smtp_daemon
-* Mon Sep 13 1999 - bs@suse.de
+* Mon Sep 13 1999 bs@suse.de
 - ran old prepare_spec on spec file to switch to new prepare_spec.
-* Mon Mar 22 1999 - werner@suse.de
+* Tue Mar 23 1999 werner@suse.de
 - Add pine format for date
-* Mon Mar 22 1999 - werner@suse.de
+* Mon Mar 22 1999 werner@suse.de
 - Add a security fix
 	- Correct a old security fix to make it work
-* Thu Jun 25 1998 - werner@suse.de
+* Thu Jun 25 1998 werner@suse.de
 - No gid mail and not sgid mail: we do not use them
-* Thu Jun 25 1998 - werner@suse.de
+* Thu Jun 25 1998 werner@suse.de
 - Even if we are safe by dropping edid we want no buffer overflow
 	- Use IOSAFE implementation for glibc instead of fpurge
-* Wed Jun 24 1998 - werner@suse.de
+* Thu Jun 25 1998 werner@suse.de
 - Move from old debian version 8.5.5 (5.5-kw) to OpenBSD 8.1 release
   plus some changes from debian, redhat, and some own.
-* Wed Feb 05 1997 - werner@suse.de
+* Wed Feb 05 1997 werner@suse.de
 - Using mailx-5.5-kw/8.5.5-debian for mail
 	- Some changes to get emacs date mark on work in mail folders
 	- Some clean up in code