diff --git a/openssh-5.7p1.dif b/openssh-5.7p1-sshd_config.diff
similarity index 100%
rename from openssh-5.7p1.dif
rename to openssh-5.7p1-sshd_config.diff
diff --git a/openssh.changes b/openssh.changes
index 23de35e..dd14df7 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Feb  3 16:42:01 UTC 2011 - pcerny@novell.com
+
+- specfile/patches cleanup 
+
 -------------------------------------------------------------------
 Mon Jan 24 11:24:59 UTC 2011 - lchiquitto@novell.com
 
diff --git a/openssh.spec b/openssh.spec
index 78222f8..2178e3d 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -30,7 +30,7 @@ PreReq:         pwdutils %insserv_prereq  %fillup_prereq coreutils
 Conflicts:      nonfreessh
 AutoReqProv:    on
 Version:        5.7p1
-Release:        1
+Release:        2
 %define xversion 1.2.4.1
 Summary:        Secure Shell Client and Server (Remote Login Program)
 Url:            http://www.openssh.com/
@@ -44,7 +44,7 @@ Source6:        README.kerberos
 Source7:        ssh.reg
 Source8:        ssh-askpass
 Source9:        sshd.fw
-Patch:          %{name}-%{version}.dif
+Patch:          %{name}-%{version}-sshd_config.diff
 Patch1:         %{name}-%{version}-askpass-fix.diff
 Patch2:         %{name}-%{version}-pam-fix2.diff
 Patch3:         %{name}-%{version}-saveargv-fix.diff
@@ -62,10 +62,10 @@ Patch16:        %{name}-%{version}-pts.diff
 Patch17:        %{name}-%{version}-homechroot.patch
 Patch18:        %{name}-%{version}-sshconfig-knownhostschanges.diff
 Patch19:        %{name}-%{version}-host_ident.diff
-Patch20:        %{name}-%{version}-selinux.diff
+Patch21:        %{name}-%{version}-selinux.diff
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 
-%package      askpass
+%package        askpass
 License:        BSD3c(or similar) ; MIT License (or similar)
 Summary:        A passphrase dialog for OpenSSH and the X Window System
 Requires:       openssh = %{version}
@@ -107,7 +107,7 @@ Window System passphrase dialog for OpenSSH.
 %patch17
 %patch18
 %patch19 -p1
-%patch20 -p1
+%patch21 -p1
 cp -v %{SOURCE4} .
 cp -v %{SOURCE6} .
 cd ../x11-ssh-askpass-%{xversion}
@@ -130,30 +130,30 @@ PIEFLAGS="-fpie"
 #Obsoleted LDFLAGS="-lpthread" \
 LDFLAGS="-pie" CFLAGS="$RPM_OPT_FLAGS $PIEFLAGS -fstack-protector" CXXFLAGS="$RPM_OPT_FLAGS $PIEFLAGS -fstack-protector" \
 ./configure --with-ssl-engine \
-	--mandir=%{_mandir} \
-	--prefix=%{prefix} \
-	--infodir=%{_infodir} \
-	--sysconfdir=/etc/ssh \
-	--libexecdir=%{prefix}/%_lib/ssh \
-	--with-tcp-wrappers \
-	--with-selinux \
-	--with-pam \
-	--with-kerberos5=/usr \
-	--with-privsep-path=/var/lib/empty \
-	--disable-strip \
-	--with-linux-audit \
-	--with-xauth=%{_prefix}/bin/xauth \
-        --target=%{_target_cpu}-suse-linux
-#        --with-afs=/usr \
+    --mandir=%{_mandir} \
+    --prefix=%{prefix} \
+    --infodir=%{_infodir} \
+    --sysconfdir=/etc/ssh \
+    --libexecdir=%{prefix}/%_lib/ssh \
+    --with-tcp-wrappers \
+    --with-selinux \
+    --with-pam \
+    --with-kerberos5=/usr \
+    --with-privsep-path=/var/lib/empty \
+    --disable-strip \
+    --with-linux-audit \
+    --with-xauth=%{_prefix}/bin/xauth \
+    --target=%{_target_cpu}-suse-linux
+#   --with-afs=/usr \
 make %{?_smp_mflags}
 (cd converter; make %{?_smp_mflags})
 cd contrib
 cd ../../x11-ssh-askpass-%{xversion}
 CFLAGS="$RPM_OPT_FLAGS" CXXFLAGS="$RPM_OPT_FLAGS"
 ./configure \
-	--mandir=%{_mandir} \
-	--prefix=%{_prefix} \
-	--libexecdir=%{prefix}/%_lib/ssh
+    --mandir=%{_mandir} \
+    --prefix=%{_prefix} \
+    --libexecdir=%{prefix}/%_lib/ssh
 xmkmf
 make includes USRLIBDIR=%_prefix/%_lib
 make %{?_smp_mflags} USRLIBDIR=%_prefix/%_lib CCOPTIONS="$RPM_OPT_FLAGS"