diff -uNr old/contrib/notmuch-mutt/notmuch-mutt new/contrib/notmuch-mutt/notmuch-mutt
--- old/contrib/notmuch-mutt/notmuch-mutt	Thu Apr 30 23:08:50 2015
+++ new/contrib/notmuch-mutt/notmuch-mutt	Thu Apr 30 23:10:21 2015
@@ -50,7 +50,7 @@
     empty_maildir($maildir);
     system("notmuch search --output=files $dup_option $query"
 	   . " | sed -e 's: :\\\\ :g'"
-	   . " | xargs --no-run-if-empty ln -s -t $maildir/cur/");
+	   . " | xargs -r -I searchoutput ln -s searchoutput $maildir/cur/");
 }
 
 sub prompt($$) {