diff --git a/man-db.crondaily b/man-db.crondaily
index efd25d6..6e95c16 100644
--- a/man-db.crondaily
+++ b/man-db.crondaily
@@ -1,4 +1,4 @@
-#! /bin/bash
+#!/bin/bash
 
 if [ -e /etc/sysconfig/man-db ]; then
     . /etc/sysconfig/man-db
@@ -17,7 +17,7 @@ LOCKFILE=/var/lock/man-db.lock
 # two man-db cron scripts get run close to each other to keep
 # them from stepping on each other's toes.  The worst that will
 # happen is that they will temporarily corrupt the database
-[ -f $LOCKFILE ] && exit 0
+[[ -f $LOCKFILE ]] && exit 0
 
 trap "{ rm -f $LOCKFILE ; exit 0; }" EXIT
 touch $LOCKFILE
diff --git a/man-db.spec b/man-db.spec
index 2f6333b..f209fc5 100644
--- a/man-db.spec
+++ b/man-db.spec
@@ -5,22 +5,26 @@ Summary: Tools for searching and reading man pages
 Name: man-db
 Version: 2.6.3
 Release: 1%{?dist}
-# project man-db  GPLv2+
-# Gnulib part     GPLv3+
+# GPLv2+ .. man-db
+# GPLv3+ .. gnulib
 License: GPLv2+ and GPLv3+
 Group: System Environment/Base
 URL: http://www.nongnu.org/man-db/
 
-Source0: http://download.savannah.gnu.org/releases/man-db/%{name}-%{version}.tar.xz
+Source0: http://download.savannah.gnu.org/releases/%{name}/%{name}-%{version}.tar.xz
 Source1: man-db.crondaily
 Source2: man-db.sysconfig
 
-# Resolves: #655385 - use old format of nroff output
-Patch1: man-db-2.5.9-sgr.patch
-Patch2: man-db-2.6.1-wildcards.patch
-Patch3: man-db-2.6.1-so-links.patch
-Patch4: man-db-2.6.1-locale-fallback.patch
-Patch6: man-db-2.6.2-invalid-cache.patch
+# resolves: #655385
+Patch0: man-db-2.5.9-sgr.patch
+# resolves: #677669
+Patch1: man-db-2.6.1-wildcards.patch
+# resolves: #693458
+Patch2: man-db-2.6.1-so-links.patch
+# resolves: #657409
+Patch3: man-db-2.6.1-locale-fallback.patch
+# resolves: #841431
+Patch4: man-db-2.6.2-invalid-cache.patch
 
 Obsoletes: man < 2.0
 Provides: man = %{version}
@@ -28,13 +32,12 @@ Provides: man-pages-reader = %{version}
 # FPC exception for gnulib - copylib - https://fedorahosted.org/fpc/ticket/174
 Provides: bundled(gnulib) = %{gnulib_ver}
 
-Requires: less, coreutils, grep, groff-base, gzip
-BuildRequires: gdbm-devel, groff, gettext, zlib-devel
-BuildRequires: libpipeline-devel, autoconf, gettext-devel
+Requires: coreutils, grep, groff-base, gzip, less
+BuildRequires: gdbm-devel, gettext, groff, libpipeline-devel, zlib-devel
 
 %description
 The man-db package includes five tools for browsing man-pages:
-man, whatis, apropos, manpath and lexgrog. man preformats and displays
+man, whatis, apropos, manpath and lexgrog. man formats and displays
 manual pages. whatis searches the manual page names. apropos searches the
 manual page names and descriptions. manpath determines search path
 for manual pages. lexgrog directly reads header information in
@@ -42,24 +45,22 @@ manual pages.
 
 %prep
 %setup -q
-%patch1 -p1 -b .sgr
-%patch2 -p1 -b .wildcards
-%patch3 -p1 -b .so-links
-%patch4 -p1 -b .locale-fallback
-%patch6 -p1 -b .invalid-cache
+%patch0 -p1 -b .sgr
+%patch1 -p1 -b .wildcards
+%patch2 -p1 -b .so-links
+%patch3 -p1 -b .locale-fallback
+%patch4 -p1 -b .invalid-cache
 
 %build
-%configure\
-    --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x"  \
+%configure \
+    --with-sections="1 1p 8 2 3 3p 4 5 6 7 9 0p n l p o 1x 2x 3x 4x 5x 6x 7x 8x" \
     --disable-setuid --with-browser=elinks --with-lzip=lzip
-
 make CC="%{__cc} %{optflags}" %{?_smp_mflags} V=1
 
 %install
-make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} \
-             INSTALL='install -p'
+make install DESTDIR=$RPM_BUILD_ROOT prefix=%{_prefix} INSTALL='install -p'
 
-# move the documentation to relevant place
+# move the documentation to the relevant place
 mv $RPM_BUILD_ROOT%{_datadir}/doc/man-db/* ./
 
 # remove zsoelim - part of groff package
@@ -86,7 +87,6 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db
 %{__rm} -rf %{cache}/*
 
 %files -f %{name}.lang -f %{name}-gnulib.lang
-%defattr(-,root,root,-)
 %doc README man-db-manual.txt man-db-manual.ps docs/COPYING ChangeLog NEWS
 %config(noreplace) %{_sysconfdir}/man_db.conf
 %config(noreplace) %{_sysconfdir}/sysconfig/man-db
@@ -123,6 +123,7 @@ install -D -p -m 0644 %{SOURCE2} $RPM_BUILD_ROOT/etc/sysconfig/man-db
 * Thu Oct 18 2012 Peter Schiffer <pschiffe@redhat.com> - 2.6.3-1
 - resolves: #858577
   updated to 2.6.3
+- cleaned .spec file
 
 * Tue Jul 31 2012 Peter Schiffer <pschiffe@redhat.com> - 2.6.2-5
 - resolves: #841431
diff --git a/man-db.sysconfig b/man-db.sysconfig
index 9b6193a..608446d 100644
--- a/man-db.sysconfig
+++ b/man-db.sysconfig
@@ -1,7 +1,6 @@
-# 
 # Set to no to disable daily man-db update by /etc/cron.daily/man-db.cron
 CRON="yes"
 
-# Options used by mandb in /etc/cron.daily/man-db.cron, 
+# Options used by mandb in /etc/cron.daily/man-db.cron,
 # we use -q as default, too much noise without.
 OPTS="-q"