diff --git a/fillup.changes b/fillup.changes
index 5573afd..c3afbcb 100644
--- a/fillup.changes
+++ b/fillup.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sun Oct 26 09:10:04 UTC 2014 - tchvatal@suse.com
+
+- Cleanup the mess in spec with spec-cleaner
+
 -------------------------------------------------------------------
 Wed Feb  8 13:08:55 UTC 2012 - rschweikert@suse.com
 
diff --git a/fillup.spec b/fillup.spec
index 29d881d..9240796 100644
--- a/fillup.spec
+++ b/fillup.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package fillup
 #
-# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 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
@@ -17,21 +17,21 @@
 
 
 Name:           fillup
-Provides:       aaa_base:/bin/fillup
 Version:        1.42
 Release:        0
 Summary:        Tool for Merging Config Files
 License:        GPL-2.0+
 Group:          System/Base
+Url:            http://github.com/openSUSE/fillup
 Source:         fillup-%{version}.tar.bz2
-Patch:          fillup-optflags.patch
+Patch0:         fillup-optflags.patch
 Patch1:         fillup-warnings.dif
 Patch2:         fillup-%{version}.dif
 Patch3:         fillup-retval.dif
 Patch4:         fillup-nodate.patch
 Patch5:         fillup-1.42-cloexec.patch
+Provides:       aaa_base:%{_bindir}/fillup
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-%define fillup_info_entry * fillup: (fillup) fillup. SuSE-fillup-tool.
 
 %description
 fillup merges files that hold variables.  A variable is defined by an
@@ -41,54 +41,28 @@ its variable name.
 
 %prep
 %setup -q
-%patch
+%patch0
 %patch1 -p1
-%patch2 -p0
-%patch3 -p0
-%patch4 -p0
+%patch2
+%patch3
+%patch4
 %patch5
 
 %build
-#
-# Be sure that the tests for fillup are run in
-# DEBUG mode for comparision with the references
-#
-# build time testing disabled when cross-compiling
-%if !0%{?_crossbuild}
-make %{?_smp_mflags} clean
-make %{?_smp_mflags} test    OPTISPLUS="$RPM_OPT_FLAGS"
-#
-# For the real world make clean and use the
-# optimzed version.
-#
-make %{?_smp_mflags} clean
-%else
-# build system does not always honor CC; workaround:
-echo -e "#!/bin/bash\nexec %__cc \"\$@\"" >gcc
-chmod 755 gcc
-export PATH=`pwd`:$PATH
-%endif
-make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="$RPM_OPT_FLAGS" CC="%__cc"
+make %{?_smp_mflags} compile COMPILE_OPTION=OPTIMIZE OPTISPLUS="%{optflags}"
 
 %install
-mkdir -p $RPM_BUILD_ROOT/var/adm/fillup-templates
-#
-# install fillup
-#
-install -d -m 755 $RPM_BUILD_ROOT/%{_bindir}
-install -m 755 BIN/fillup $RPM_BUILD_ROOT/%{_bindir}
-#UsrMerge
-install -d -m 755 $RPM_BUILD_ROOT/bin
-ln -sf %{_bindir}/fillup $RPM_BUILD_ROOT/bin
-#EndUserMerge
-install -d $RPM_BUILD_ROOT/%{_mandir}/man8
-install -m 644 SGML/fillup.8.gz $RPM_BUILD_ROOT/%{_mandir}/man8
+mkdir -p %{buildroot}%{_localstatedir}/adm/fillup-templates
+install -d -m 755 %{buildroot}/%{_bindir}
+install -m 755 BIN/fillup %{buildroot}/%{_bindir}
+install -d %{buildroot}/%{_mandir}/man8
+install -m 644 SGML/fillup.8.gz %{buildroot}/%{_mandir}/man8
+
+%check
+make %{?_smp_mflags} test    OPTISPLUS="%{optflags}"
 
 %files
 %defattr(-,root,root)
-#UsrMerge
-/bin/fillup
-#EndUserMerge
 %{_bindir}/fillup
 %{_mandir}/man8/fillup*