diff --git a/contrib/liveusb/etc/systemd/system/mongoose.service b/contrib/liveusb/etc/systemd/system/mongoose.service
new file mode 100644
index 000000000..2ff7070d7
--- /dev/null
+++ b/contrib/liveusb/etc/systemd/system/mongoose.service
@@ -0,0 +1,15 @@
+[Unit]
+Description=The mongoose Web server
+After=network.target
+
+[Service]
+Type=simple
+User=nobody
+Group=nobody
+Restart=always
+ExecStart=/usr/bin/mongoose -p 80 -r /var/www/
+StandardOutput=syslog
+SyslogIdentifier=mongoose
+
+[Install]
+WantedBy=multi-user.target
diff --git a/contrib/liveusb/setup.sh b/contrib/liveusb/setup.sh
index 29bbff726..cb42fa00a 100755
--- a/contrib/liveusb/setup.sh
+++ b/contrib/liveusb/setup.sh
@@ -23,7 +23,7 @@ ssh -f -N -R $PORT:localhost:22 $USER@$SERVER
 sendmail "$RECIPIENTS" <<EOF
 Subject: New S2SS node alive: $IP ($HOSTNAME)
 From: Simulator2Simulator Server <acs@0l.de>
-To: $(RECIPIENTS)
+To: $RECIPIENTS
 
 There's a new host with the S2SS LiveUSB Image running: