--- ./src/parallel.orig	2012-08-22 21:25:08.000000000 -0500
+++ ./src/parallel	2012-08-22 21:25:24.000000000 -0500
@@ -4571,21 +4571,15 @@
     # Returns:
     #   number of chars on the longest command line allowed
     if(not $Limits::Command::line_max_len) {
+	$Limits::Command::line_max_len = `getconf ARG_MAX` - 1024;
 	if($::opt_s) {
-	    if(is_acceptable_command_line_length($::opt_s)) {
-		$Limits::Command::line_max_len = $::opt_s;
-	    } else {
-		# -s is too long: Find the correct
-		$Limits::Command::line_max_len = binary_find_max_length(0,$::opt_s);
+	    if($::opt_s > $Limits::Command::line_max_len) {
+	     	print STDERR "$Global::progname: ",
+	     	"you are setting value for -s greater than $Limits::Command::line_max_len\n";
 	    }
 	    if($::opt_s <= $Limits::Command::line_max_len) {
 		$Limits::Command::line_max_len = $::opt_s;
-	    } else {
-		::warning("Value for -s option ",
-			  "should be < $Limits::Command::line_max_len.\n");
 	    }
-	} else {
-	    $Limits::Command::line_max_len = real_max_length();
 	}
     }
     return $Limits::Command::line_max_len;