diff --git a/src/parallel b/src/parallel
index 4e6a0239..f81bc635 100755
--- a/src/parallel
+++ b/src/parallel
@@ -949,7 +949,7 @@ sub parse_options {
 
 sub init_globals {
     # Defaults:
-    $Global::version = 20150101;
+    $Global::version = 20150106;
     $Global::progname = 'parallel';
     $Global::infinity = 2**31;
     $Global::debug = 0;
@@ -2305,6 +2305,7 @@ sub parse_sshlogin {
 		# This may add to @Global::sshlogin - possibly bug
 		read_sshloginfile(expand_slf_shorthand($s));
             } else {
+		$s =~ s/\s*$//;
                 push (@login, $s);
             }
         }
diff --git a/src/parallel.pod b/src/parallel.pod
index 972df70a..2a99d0d2 100644
--- a/src/parallel.pod
+++ b/src/parallel.pod
@@ -4274,18 +4274,20 @@ The error message you get (if any).
 =item *
 
 The complete output of B<parallel --version>. If you are not running
-the latest released version you should specify why you believe the
-problem is not fixed in that version.
+the latest released version (see http://ftp.gnu.org/gnu/parallel/) you
+should specify why you believe the problem is not fixed in that
+version.
 
 =item *
 
-A complete example that others can run that shows the problem. This
-should preferably be small and simple. A combination of B<yes>,
-B<seq>, B<cat>, B<echo>, and B<sleep> can reproduce most errors. If
-your example requires large files, see if you can make them by
-something like B<seq 1000000> > B<file> or B<yes | head -n 10000000> >
-B<file>. If your example requires remote execution, see if you can
-use B<localhost> - maybe using another login.
+A complete example that others can run that shows the problem
+including all files needed to run the example. This should preferably
+be small and simple. A combination of B<yes>, B<seq>, B<cat>, B<echo>,
+and B<sleep> can reproduce most errors. If your example requires large
+files, see if you can make them by something like B<seq 1000000> >
+B<file> or B<yes | head -n 10000000> > B<file>. If your example
+requires remote execution, see if you can use B<localhost> - maybe
+using another login.
 
 =item *
 
diff --git a/testsuite/tests-to-run/parallel-local-ssh3.sh b/testsuite/tests-to-run/parallel-local-ssh3.sh
index 8504e9b4..284fa436 100644
--- a/testsuite/tests-to-run/parallel-local-ssh3.sh
+++ b/testsuite/tests-to-run/parallel-local-ssh3.sh
@@ -32,4 +32,7 @@ echo '### --hostgroup -S @group1 -Sgrp2'
 echo '### --hostgroup -S @group1+grp2'
   parallel -S @g1+g2 -S @g1/1/tcsh@lo -S @g1/1/localhost -S @g2/1/parallel@lo whoami\;true ::: {1..6} | sort
 
+echo '### trailing space in sshlogin'
+  echo 'sshlogin trailing space' | parallel  --sshlogin "ssh -l parallel localhost " echo
+
 EOF
diff --git a/testsuite/wanted-results/parallel-local-ssh3 b/testsuite/wanted-results/parallel-local-ssh3
index 3773b912..868b4366 100644
--- a/testsuite/wanted-results/parallel-local-ssh3
+++ b/testsuite/wanted-results/parallel-local-ssh3
@@ -87,3 +87,7 @@ tange
 tange
 tcsh
 tcsh
+echo '### trailing space in sshlogin'
+### trailing space in sshlogin
+  echo 'sshlogin trailing space' | parallel  --sshlogin "ssh -l parallel localhost " echo
+sshlogin trailing space