diff --git a/x11-tools.changes b/x11-tools.changes
index 9e9c500..504f415 100644
--- a/x11-tools.changes
+++ b/x11-tools.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Wed Oct 24 12:48:26 UTC 2018 - sndirsch@suse.com
+
+- remove hostname's '-f' option since it may fail or - even worse -
+  causes timeouts (boo#1113087)
+
 -------------------------------------------------------------------
 Thu Nov 23 13:54:15 UTC 2017 - rbrown@suse.com
 
diff --git a/x11-tools.spec b/x11-tools.spec
index 937975f..0bcc47d 100644
--- a/x11-tools.spec
+++ b/x11-tools.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package x11-tools
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -30,7 +30,7 @@ Obsoletes:      xf86tools
 Version:        0.1
 Release:        0
 Summary:        Tools for the X Window System
-License:        GPL-2.0+ and MIT
+License:        GPL-2.0-or-later AND MIT
 Group:          System/X11/Utilities
 Source2:        xf86debug
 Source31:       xim
diff --git a/xim b/xim
index 91a2045..69a5069 100644
--- a/xim
+++ b/xim
@@ -63,7 +63,7 @@ echo "/etc/X11/xim: Checking whether an input method should be started."
 
 adduserenv () {
     local cur var=${1+"$@"}
-    : ${HOSTNAME:=$(hostname -f)}
+    : ${HOSTNAME:=$(hostname)}
     # Use ~/.i18n
     if test -e "$HOME/.i18n"; then
 	echo "/etc/X11/xim: Checking whether an input method is specified in $HOME/.i18n."