diff -Naur x2goserver-4.0.1.18.orig/rpm/x2goserver.init x2goserver-4.0.1.18/rpm/x2goserver.init
--- x2goserver-4.0.1.18.orig/rpm/x2goserver.init	2014-10-06 23:23:27.000000000 +0200
+++ x2goserver-4.0.1.18/rpm/x2goserver.init	2015-01-14 11:23:42.840796430 +0100
@@ -35,7 +35,7 @@
 		mkdir $XSOCKDIR
 		chmod 1777 $XSOCKDIR
 	fi
-	echo -n $"Starting $prog: "
+	printf '%s' $"Starting $prog: "
 	daemon $exec $OPTS
 	retval=$?
 	echo
@@ -43,7 +43,7 @@
 }
 
 stop() {
-	echo -n $"Stopping $prog: "
+	printf '%s' $"Stopping $prog: "
 	killproc $exec
 	retval=$?
 	echo
diff -Naur x2goserver-4.0.1.18.orig/x2goserver/bin/x2gopath x2goserver-4.0.1.18/x2goserver/bin/x2gopath
--- x2goserver-4.0.1.18.orig/x2goserver/bin/x2gopath	2014-10-06 23:23:27.000000000 +0200
+++ x2goserver-4.0.1.18/x2goserver/bin/x2gopath	2015-01-14 11:25:57.105755690 +0100
@@ -32,12 +32,12 @@
 
 # The following section is subject to substitution by distro packaging tools.
 case "$1" in
-	base) echo -n "$base";;
-	lib) echo -n "$base/lib/x2go";;
-	libexec) echo -n "$base/lib/x2go";;
-	share) echo -n "$base/share/x2go";;
-	nx-x11) echo -n "$base/lib/nx/X11";;
-	xinerama) echo -n "$base/lib/nx/X11/Xinerama";;
+	base) printf '%s' "$base";;
+	lib) printf '%s' "$base/lib/x2go";;
+	libexec) printf '%s' "$base/lib/x2go";;
+	share) printf '%s' "$base/share/x2go";;
+	nx-x11) printf '%s' "$base/lib/nx/X11";;
+	xinerama) printf '%s' "$base/lib/nx/X11/Xinerama";;
 	*) exit 1;;
 esac;
 
diff -Naur x2goserver-4.0.1.18.orig/x2goserver-xsession/etc/Xsession x2goserver-4.0.1.18/x2goserver-xsession/etc/Xsession
--- x2goserver-4.0.1.18.orig/x2goserver-xsession/etc/Xsession	2014-10-06 23:23:27.000000000 +0200
+++ x2goserver-4.0.1.18/x2goserver-xsession/etc/Xsession	2015-01-14 11:23:42.840796430 +0100
@@ -26,9 +26,9 @@
 	# pretty-print messages of arbitrary length (no trailing newline); use
 	# xmessage if it is available and $DISPLAY is set
 	MESSAGE="$PROGNAME: $*"
-	echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2;
+	printf '%s' "$MESSAGE" | fold -s -w ${COLUMNS:-80} >&2;
 	if [ -n "$DISPLAY" ] && which xmessage 1> /dev/null 2>&1; then
-		echo -n "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
+		printf '%s' "$MESSAGE" | fold -s -w ${COLUMNS:-80} | xmessage -center -file -
 	fi
 }