diff --git a/ed.spec b/ed.spec
index 31e5404..24a3255 100644
--- a/ed.spec
+++ b/ed.spec
@@ -1,23 +1,31 @@
 #
 # spec file for package ed (Version 0.2)
 #
-# Copyright (c) 2006 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:           ed
-URL:            http://www.gnu.org/software/ed/
-License:        GNU General Public License (GPL) - all versions, GNU Library General Public License v. 2.0 and 2.1 (LGPL)
+Url:            http://www.gnu.org/software/ed/
+License:        GPL v2 or later; LGPL v2.1 or later
 Group:          Productivity/Editors/Other
 PreReq:         %install_info_prereq
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        0.2
-Release:        887
+Release:        1001
 Summary:        Standard UNIX Line Editor
 Source:         ed-0.2.tar.gz
 Patch:          ed-0.2.diff
@@ -57,6 +65,9 @@ mkdir -p $RPM_BUILD_ROOT/bin
 mv $RPM_BUILD_ROOT/usr/bin/ed $RPM_BUILD_ROOT/bin/ed
 ln -s /bin/ed $RPM_BUILD_ROOT/usr/bin/ed
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
 %defattr(-,root,root)
 /bin/ed
@@ -72,44 +83,44 @@ ln -s /bin/ed $RPM_BUILD_ROOT/usr/bin/ed
 %postun
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/%{name}.info.gz
 
-%changelog -n ed
-* Fri Oct 20 2006 - lrupp@suse.de
+%changelog
+* Fri Oct 20 2006 lrupp@suse.de
 - revert to 0.2: new version is broken (#212749)
-* Mon Oct 09 2006 - agruen@suse.de
+* Tue Oct 10 2006 agruen@suse.de
 - dash-option.diff: Fix `ed - filename' invocation.
-* Mon Oct 09 2006 - schwab@suse.de
+* Mon Oct 09 2006 schwab@suse.de
 - Update to ed 0.3-pre2.
   * The symlink vulnerability has been fixed using the "tmpfile" function.
   * The manual has been updated.
   * An extensive code cleanup has been done.
 - Fix signal handing again.
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Fri Oct 01 2004 - schwab@suse.de
+* Fri Oct 01 2004 schwab@suse.de
 - Fix signal handling
   (<http://lists.gnu.org/archive/html/bug-gnu-utils/2004-09/msg00123.html>).
-* Sat Sep 11 2004 - schwab@suse.de
+* Sat Sep 11 2004 schwab@suse.de
 - Don't use __P from glibc headers.
-* Sat Jan 10 2004 - adrian@suse.de
+* Sat Jan 10 2004 adrian@suse.de
 - add %%defattr
-* Thu Apr 24 2003 - ro@suse.de
+* Thu Apr 24 2003 ro@suse.de
 - fix install_info --delete call and move from preun to postun
-* Tue Apr 15 2003 - coolo@suse.de
+* Tue Apr 15 2003 coolo@suse.de
 - use BuildRoot
-* Mon Mar 03 2003 - ro@suse.de
+* Mon Mar 03 2003 ro@suse.de
 - fixed typo in dir entry
-* Mon Mar 03 2003 - ro@suse.de
+* Mon Mar 03 2003 ro@suse.de
 - added info dir entry
-* Fri Feb 07 2003 - ro@suse.de
+* Fri Feb 07 2003 ro@suse.de
 - use install_info macros
-* Tue Sep 17 2002 - ro@suse.de
+* Tue Sep 17 2002 ro@suse.de
 - removed bogus self-provides
-* Tue Dec 19 2000 - werner@suse.de
+* Tue Dec 19 2000 werner@suse.de
 - Close temporary file security hole
-* Fri Feb 25 2000 - kukuk@suse.de
+* Fri Feb 25 2000 kukuk@suse.de
 - Use RPM_OPT_FLAGS
 - Move /usr/{info,man} -> /usr/share/{info,man}
-* Sat Nov 06 1999 - bs@suse.de
+* Sat Nov 06 1999 bs@suse.de
 - moved binary to /bin/ed and provide symlink /usr/bin/ed
-* 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.