diff --git a/doc/release_new_version b/doc/release_new_version
index 6400eb39..838c5274 100644
--- a/doc/release_new_version
+++ b/doc/release_new_version
@@ -207,9 +207,9 @@ cc:Sandro Cazzaniga <kharec@mandriva.org>,
    Ryoichiro Suzuki <ryoichiro.suzuki@gmail.com>,
    Jesse Alama <jesse.alama@gmail.com>
 
-Subject: GNU Parallel 20140322 ('') released
+Subject: GNU Parallel 20140322 ('昆明 Kunming') released
 
-GNU Parallel 20140322 ('') has been released. It is available for download at: http://ftp.gnu.org/gnu/parallel/
+GNU Parallel 20140322 ('昆明 Kunming') has been released. It is available for download at: http://ftp.gnu.org/gnu/parallel/
 
 
 New in this release:
diff --git a/testsuite/tests-to-run/parallel-freebsd.sh b/testsuite/tests-to-run/parallel-freebsd.sh
new file mode 100644
index 00000000..c038ca18
--- /dev/null
+++ b/testsuite/tests-to-run/parallel-freebsd.sh
@@ -0,0 +1,35 @@
+#!/bin/bash
+
+echo "### These tests requires VirtualBox running with the following images"
+echo `whoami`"@freebsd7"
+
+VBoxManage startvm FreeBSD71 >/dev/null 2>&1
+ping -c 1 freebsd7.tange.dk >/dev/null 2>&1
+
+ssh freebsd7.tange.dk touch .parallel/will-cite
+scp -q .*/src/{parallel,sem,sql,niceload} freebsd7.tange.dk:bin/
+
+cat <<'EOF' | sed -e 's/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -k -S freebsd7.tange.dk -j4 
+echo 'bug #40136: FreeBSD: No more processes'
+# Long line due to FreeBSD's /bin/sh stupidity
+  sem --jobs 3 --id my_id -u 'echo First started; sleep 5; echo The first finished' &&   sem --jobs 3 --id my_id -u 'echo Second started; sleep 6; echo The second finished' &&   sem --jobs 3 --id my_id -u 'echo Third started; sleep 7; echo The third finished' &&   sem --jobs 3 --id my_id -u 'echo Fourth started; sleep 8; echo The fourth finished' &&   sem --wait --id my_id
+
+echo 'Test --compress --pipe'
+  jot 1000 | parallel --compress --pipe cat | wc
+
+echo 'bug #41613: --compress --line-buffer no newline';
+  perl -e 'print "It worked"'| parallel --pipe --compress --line-buffer cat; echo
+
+echo 'bug #40135: FreeBSD: sem --fg does not finish under /bin/sh'
+  sem --fg 'sleep 1; echo The job finished' 
+
+echo 'bug #40133: FreeBSD: --round-robin gives no output'
+  jot 1000000 | parallel --round-robin --pipe -kj3 wc | sort
+  jot 1000000 | parallel --round-robin --pipe -kj4 wc | sort
+
+EOF
+
+VBoxManage controlvm FreeBSD71 savestate
+
+
+
diff --git a/testsuite/wanted-results/parallel-freebsd b/testsuite/wanted-results/parallel-freebsd
new file mode 100644
index 00000000..9a640abd
--- /dev/null
+++ b/testsuite/wanted-results/parallel-freebsd
@@ -0,0 +1,25 @@
+### These tests requires VirtualBox running with the following images
+tange@freebsd7
+bug #40136: FreeBSD: No more processes
+First started
+Second started
+Third started
+The first finished
+Fourth started
+The second finished
+The third finished
+The fourth finished
+Test --compress --pipe
+    1000    1000    3893
+bug #41613: --compress --line-buffer no newline
+It worked
+bug #40135: FreeBSD: sem --fg does not finish under /bin/sh
+The job finished
+bug #40133: FreeBSD: --round-robin gives no output
+  299592  299592 2097144
+  299594  299594 2097158
+  400814  400814 2694594
+  149797  149797 1048579
+  235145  235145 1646016
+  299593  299593 2097151
+  315465  315465 2097150