diff --git a/setup/freebsd/ansible-vars.yaml b/setup/freebsd/ansible-vars.yaml
index 78e2bb029..0d2294fdd 100644
--- a/setup/freebsd/ansible-vars.yaml
+++ b/setup/freebsd/ansible-vars.yaml
@@ -5,7 +5,7 @@ ssh_users:
   - rvagg
   - jbergstroem
 packages:
-  - openjdk
+  - openjdk-jre
   - git
   - gmake
   - ccache
diff --git a/setup/freebsd/resources/jenkins b/setup/freebsd/resources/jenkins
index 97f2694b4..e76f405ee 100644
--- a/setup/freebsd/resources/jenkins
+++ b/setup/freebsd/resources/jenkins
@@ -27,6 +27,7 @@ load_rc_config "${name}"
 OSTYPE="freebsd"
 NODE_COMMON_PIPE="/home/iojs/test.pipe"
 LOCALHOST="{{interface}}"
+BROADCAST="{{broadcast}}"
 PATH="/usr/local/libexec/ccache:/usr/local/bin:${PATH}"
 
 jenkins_jnlpurl="https://ci.nodejs.org/computer/iojs-voxer-freebsd101-{{id}}/slave-agent.jnlp"
@@ -39,9 +40,9 @@ jenkins_group="iojs"
 
 pidfile="/var/run/jenkins/jenkins.pid"
 command="/usr/sbin/daemon"
-procname="/usr/local/openjdk7/bin/java"
-command_args="-p ${pidfile} ${procname} -jar ${jenkins_jar} ${jenkins_args} > ${jenkins_log_file} 2>&1"
-env="PATH=${PATH} LOCALHOST=${LOCALHOST} OSTYPE=${OSTYPE} NODE_COMMON_PIPE=${NODE_COMMON_PIPE} CC=cc CXX=c++"
+procname="/usr/local/openjdk7-jre/bin/java"
+command_args="-r -p ${pidfile} ${procname} -jar ${jenkins_jar} ${jenkins_args} > ${jenkins_log_file} 2>&1"
+env="PATH=${PATH} BROADCAST=${BROADCAST} LOCALHOST=${LOCALHOST} OSTYPE=${OSTYPE} NODE_COMMON_PIPE=${NODE_COMMON_PIPE} CC=cc CXX=c++"
 required_files="${procname} ${jenkins_jar}"
 
 start_precmd="jenkins_prestart"
diff --git a/setup/linter/resources/jenkins b/setup/linter/resources/jenkins
index 2b284229b..438ceb35a 100644
--- a/setup/linter/resources/jenkins
+++ b/setup/linter/resources/jenkins
@@ -39,7 +39,7 @@ jenkins_group="iojs"
 pidfile="/var/run/jenkins/jenkins.pid"
 command="/usr/sbin/daemon"
 procname="/usr/local/openjdk7/bin/java"
-command_args="-p ${pidfile} ${procname} -jar ${jenkins_jar} ${jenkins_args} > ${jenkins_log_file} 2>&1"
+command_args="-r -p ${pidfile} ${procname} -jar ${jenkins_jar} ${jenkins_args} > ${jenkins_log_file} 2>&1"
 env="PATH=${PATH} OSTYPE=${OSTYPE} NODE_COMMON_PIPE=${NODE_COMMON_PIPE} CC=cc CXX=c++"
 required_files="${procname} ${jenkins_jar}"