diff --git a/openssh-5.4p1-sshconfig-knownhostschanges.diff b/openssh-5.4p1-sshconfig-knownhostschanges.diff
index 8bfb3b6..1468a63 100644
--- a/openssh-5.4p1-sshconfig-knownhostschanges.diff
+++ b/openssh-5.4p1-sshconfig-knownhostschanges.diff
@@ -2,16 +2,14 @@ Index: ssh_config
 ===================================================================
 --- ssh_config.orig
 +++ ssh_config
-@@ -67,5 +67,14 @@ ForwardX11Trusted yes
+@@ -67,5 +67,12 @@ ForwardX11Trusted yes
  SendEnv LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES 
  SendEnv LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT 
  SendEnv LC_IDENTIFICATION LC_ALL
 -#   VisualHostKey no
 +# This will print the fingerprint of the host key in "visual" form
 +# this should make it easier to also recognize bad things
-+# (enabled for openSUSE Factory before 11.3, if too much people are against,
-+#  we can disable it again. meissner@novell.com)
-+VisualHostKey yes
++VisualHostKey no
 +
 +# This will hash new host keys and make them so unusable for malicious
 +# people or software trying to use known_hosts to find further hops.
diff --git a/openssh-askpass-gnome.spec b/openssh-askpass-gnome.spec
index 850c432..6766b05 100644
--- a/openssh-askpass-gnome.spec
+++ b/openssh-askpass-gnome.spec
@@ -23,7 +23,7 @@ BuildRequires:  gtk2-devel krb5-devel opensc-devel openssh openssl-devel pam-dev
 License:        BSD3c(or similar)
 Group:          Productivity/Networking/SSH
 Version:        5.4p1
-Release:        5
+Release:        6
 Requires:       openssh = %{version} openssh-askpass = %{version}
 AutoReqProv:    on
 Summary:        A GNOME-Based Passphrase Dialog for OpenSSH
diff --git a/openssh.changes b/openssh.changes
index db53e6a..9e507ce 100644
--- a/openssh.changes
+++ b/openssh.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Jun 30 16:01:30 CEST 2010 - meissner@suse.de
+
+- Disable visual hostkey support again, after discussion on 
+  its usefulness.
+
 -------------------------------------------------------------------
 Mon May 17 18:11:33 UTC 2010 - cristian.rodriguez@opensuse.org
 
diff --git a/openssh.spec b/openssh.spec
index 8864b7b..17ece96 100644
--- a/openssh.spec
+++ b/openssh.spec
@@ -36,7 +36,7 @@ PreReq:         pwdutils %insserv_prereq  %fillup_prereq coreutils permissions
 Conflicts:      nonfreessh
 AutoReqProv:    on
 Version:        5.4p1
-Release:        5
+Release:        6
 %define xversion 1.2.4.1
 Summary:        Secure Shell Client and Server (Remote Login Program)
 Url:            http://www.openssh.com/