diff --git a/doc/release_new_version b/doc/release_new_version
index a6879b13..41a72820 100644
--- a/doc/release_new_version
+++ b/doc/release_new_version
@@ -217,13 +217,17 @@ No new functionality was introduced so this is a good candidate for a stable rel
 
 Haiku of the month:
 
-  Multi core I see.
+  Multi cores I see.
   Doing nothing. I say no!
   Use GNU Parallel.
       -- Ole Tange
 
 New in this release:
 
+* Due to widely spread distributions still using --tollef even after a year of being retired following a year of being obsolete, --tollef now gives an error unless used with --gnu.
+
+* A parser for GNU Parallel --joblog files: https://github.com/harryjubb/joblog
+
 * <<Har angiveligt submittet ny version - afventer opdatering>> GNU Parallel was used (unfortunately without citation) in: MUGBAS: a species free gene-based programme suite for post-GWAS analysis http://www.ncbi.nlm.nih.gov/pubmed/25765345
 
 * <<Afventer updateret publisering>> GNU Parallel was used in: Large Scale Author Name Disambiguation in Digital Libraries http://ieeexplore.ieee.org/xpl/abstractReferences.jsp?tp=&arnumber=7004487&url=http%3A%2F%2Fieeexplore.ieee.org%2Fxpls%2Fabs_all.jsp%3Farnumber%3D7004487
diff --git a/src/parallel b/src/parallel
index b28eb4cd..6827caea 100755
--- a/src/parallel
+++ b/src/parallel
@@ -787,7 +787,7 @@ sub options_hash {
 	 "remove-rec-sep|removerecsep|rrs" => \$opt::remove_rec_sep,
 	 "files|output-as-files|outputasfiles" => \$opt::files,
 	 "block|block-size|blocksize=s" => \$opt::blocksize,
-	 "tollef" => \$opt::retired,
+	 "tollef" => \$opt::tollef,
 	 "gnu" => \$opt::ignored_option,
 	 "xapply" => \$opt::xapply,
 	 "bibtex" => \$opt::bibtex,
@@ -1057,10 +1057,14 @@ sub parse_options {
 		    "-Y has been retired. Use --shebang.",
 		    "-H has been retired. Use --halt.",
 		    "--ctrlc has been retired.",
-		    "--noctrlc has been retired.",
-		    "--tollef has been retired. Use -u -q --arg-sep -- and --load for -l.");
+		    "--noctrlc has been retired.");
             ::wait_and_exit(255);
     }
+    if(defined $opt::tollef and not $opt::gnu) {
+       ::error("--tollef has been retired.","Remove --tollef or use --gnu to override --tollef.");
+       ::wait_and_exit(255);
+    }
+
     citation_notice();
 
     parse_halt();