diff --git a/aircast/src/aircast.c b/aircast/src/aircast.c
index b8c3b25a..8325acb9 100644
--- a/aircast/src/aircast.c
+++ b/aircast/src/aircast.c
@@ -684,11 +684,11 @@ static void sighandler(int signum) {
 			if (p->InUse && p->State == PLAYING) CastStop(p->CastCtx);
 		}
 		LOG_INFO("forced exit", NULL);
-		exit(EXIT_SUCCESS);
+		exit(0);
 	}
 
 	Stop();
-	exit(EXIT_SUCCESS);
+	exit(0);
 }
 
 
diff --git a/airupnp.service b/airupnp.service
new file mode 100644
index 00000000..2fe7114e
--- /dev/null
+++ b/airupnp.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=AirUPnP bridge
+After=network-online.target
+Wants=network-online.target
+
+[Service]
+Type=forking
+ExecStart=/var/lib/airconnect/airupnp-arm -m squeezebox -l 1000:2000 -z -f /var/log/airupnp.log -x /var/lib/airconnect/config-upnp.xml
+Restart=on-failure
+RestartSec=30
+
+[Install]
+WantedBy=multi-user.target
diff --git a/airupnp/src/airupnp.c b/airupnp/src/airupnp.c
index b3cdb97d..d05a6895 100644
--- a/airupnp/src/airupnp.c
+++ b/airupnp/src/airupnp.c
@@ -1028,11 +1028,11 @@ static void sighandler(int signum) {
 			if (p->InUse && p->State == PLAYING) AVTStop(p);
 		}
 		LOG_INFO("forced exit", NULL);
-		exit(EXIT_SUCCESS);
+		exit(0);
 	}
 
 	Stop();
-	exit(EXIT_SUCCESS);
+	exit(0);
 }
 
 
diff --git a/bin/aircast-arm b/bin/aircast-arm
index 052c98ec..084706bc 100644
Binary files a/bin/aircast-arm and b/bin/aircast-arm differ
diff --git a/bin/aircast-osx-multi b/bin/aircast-osx-multi
index 1a087035..efbbfac1 100644
Binary files a/bin/aircast-osx-multi and b/bin/aircast-osx-multi differ
diff --git a/bin/aircast-win.exe b/bin/aircast-win.exe
index f3df282b..67fec9e9 100644
Binary files a/bin/aircast-win.exe and b/bin/aircast-win.exe differ
diff --git a/bin/aircast-x86 b/bin/aircast-x86
index f6114514..e7d70c22 100644
Binary files a/bin/aircast-x86 and b/bin/aircast-x86 differ
diff --git a/bin/aircast-x86-64 b/bin/aircast-x86-64
index 36b68d01..b37432e5 100644
Binary files a/bin/aircast-x86-64 and b/bin/aircast-x86-64 differ
diff --git a/bin/airupnp-arm b/bin/airupnp-arm
index 27307c42..c832d9ab 100644
Binary files a/bin/airupnp-arm and b/bin/airupnp-arm differ
diff --git a/bin/airupnp-osx-multi b/bin/airupnp-osx-multi
index bb8c31da..9eeb9646 100644
Binary files a/bin/airupnp-osx-multi and b/bin/airupnp-osx-multi differ
diff --git a/bin/airupnp-win.exe b/bin/airupnp-win.exe
index 93466121..d7617ba0 100644
Binary files a/bin/airupnp-win.exe and b/bin/airupnp-win.exe differ
diff --git a/bin/airupnp-x86 b/bin/airupnp-x86
index 7bc82f7e..7837313b 100644
Binary files a/bin/airupnp-x86 and b/bin/airupnp-x86 differ
diff --git a/bin/airupnp-x86-64 b/bin/airupnp-x86-64
index 00faa664..a7e573c0 100644
Binary files a/bin/airupnp-x86-64 and b/bin/airupnp-x86-64 differ