diff --git a/fillup.spec b/fillup.spec
index ef1895e..3a43f20 100644
--- a/fillup.spec
+++ b/fillup.spec
@@ -1,22 +1,30 @@
 #
 # spec file for package fillup (Version 1.42)
 #
-# 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:           fillup
-License:        GPL
+License:        GPL v2 or later
 Group:          System/Base
 Provides:       aaa_base:/bin/fillup
-Autoreqprov:    on
+AutoReqProv:    on
 Version:        1.42
-Release:        123
+Release:        242
 Summary:        Tool for Merging Config Files
 Source:         fillup-%{version}.tar.bz2
 Patch:          fillup-optflags.patch
@@ -69,68 +77,71 @@ install -m 755 BIN/fillup $RPM_BUILD_ROOT/bin
 install -d $RPM_BUILD_ROOT/%{_mandir}/man8
 install -m 644 SGML/fillup.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8
 
+%clean
+rm -rf $RPM_BUILD_ROOT
+
 %files
 %defattr(-,root,root)
 /bin/fillup
 %{_mandir}/man8/fillup*
 
-%changelog -n fillup
-* Tue Sep 19 2006 - rguenther@suse.de
+%changelog
+* Tue Sep 19 2006 rguenther@suse.de
 - Do not install info or plaintext documentation (same as manpage).
 - Remove sgmltool BuildRequires.
-* Mon May 22 2006 - schwab@suse.de
+* Mon May 22 2006 schwab@suse.de
 - Don't strip binaries.
-* Wed Jan 25 2006 - mls@suse.de
+* Wed Jan 25 2006 mls@suse.de
 - converted neededforbuild to BuildRequires
-* Wed Jan 11 2006 - ro@suse.de
+* Wed Jan 11 2006 ro@suse.de
 - fix missing return value in test-code (#139594)
-* Fri Sep 02 2005 - werner@suse.de
+* Fri Sep 02 2005 werner@suse.de
 - Fix segv on big endian (bug #114066)
   * Correct usage of EOF macro, this is and was never a character
   * Make it handle missing newline at EOF
 - Make it strict alias safe
 - Compare the correct debug output in test suite (bug #95371)
-* Wed Jul 27 2005 - ro@suse.de
+* Wed Jul 27 2005 ro@suse.de
 - silence some compiler warnings (#95370)
-* Tue Jun 28 2005 - ro@suse.de
+* Tue Jun 28 2005 ro@suse.de
 - removed -fsigned-char (#93875)
-* Wed Jun 15 2005 - meissner@suse.de
+* Wed Jun 15 2005 meissner@suse.de
 - Use RPM_OPT_FLAGS -fno-strict-aliasing.
 - compile OPTIMIZE, drop some no longer applying -f flags.
-* Mon Mar 01 2004 - ro@suse.de
+* Mon Mar 01 2004 ro@suse.de
 - fix install_info stuff in postun
-* Mon Oct 20 2003 - ro@suse.de
+* Mon Oct 20 2003 ro@suse.de
 - use defattr
 - don't build as root
-* Thu Sep 11 2003 - ro@suse.de
+* Thu Sep 11 2003 ro@suse.de
 - update to 1.42 (#30279)
-* Mon Aug 25 2003 - ro@suse.de
+* Mon Aug 25 2003 ro@suse.de
 - update to 1.41
 - additional Keyword: PreSaveCommand
-* Thu Aug 14 2003 - ro@suse.de
+* Thu Aug 14 2003 ro@suse.de
 - update to 1.38 with additional MetaData keywords
-* Mon Jun 16 2003 - kukuk@suse.de
+* Mon Jun 16 2003 kukuk@suse.de
 - Remove /var/adm/fillup-templates, already in filesystem package
-* Wed Mar 12 2003 - ro@suse.de
+* Wed Mar 12 2003 ro@suse.de
 - update to 1.24 including the last two patches and
   more testcases for "make check"
-* Wed Mar 12 2003 - ro@suse.de
+* Wed Mar 12 2003 ro@suse.de
 - switch behaviour to "fixed sequence of metadata" (#25119)
-* Sun Mar 09 2003 - ro@suse.de
+* Sun Mar 09 2003 ro@suse.de
 - fix watchdog for removal part (factor 2 needed)
   (fix for reopened #24648)
-* Thu Mar 06 2003 - ro@suse.de
+* Thu Mar 06 2003 ro@suse.de
 - update to 1.22 (avoid possible infinite loop on failure) (#24648)
-* Thu Mar 06 2003 - ro@suse.de
+* Thu Mar 06 2003 ro@suse.de
 - fix for stale comment when removing variable (#24540)
-* Wed Feb 19 2003 - ro@suse.de
+* Wed Feb 19 2003 ro@suse.de
 - update to 1.21
 - works around problem with comments wrongly typed as metadata
-* Thu Feb 06 2003 - ro@suse.de
+* Thu Feb 06 2003 ro@suse.de
 - added install-info macros
-* Thu Nov 28 2002 - ro@suse.de
+* Thu Nov 28 2002 ro@suse.de
 - update to 1.20 beta (aka prototype)
-* Mon Nov 11 2002 - ro@suse.de
+* Mon Nov 11 2002 ro@suse.de
 - changed neededforbuild <sp> to <opensp>
-* Mon Aug 12 2002 - ro@suse.de
+* Mon Aug 12 2002 ro@suse.de
 - split off aaa_base