diff --git a/Makefile b/Makefile
index 6542e7f..9ad0f75 100644
--- a/Makefile
+++ b/Makefile
@@ -44,12 +44,12 @@ endif
 dist: clean linux
 
 	mkdir -p $(DIST)opt/ecix/birdwatcher/bin
-	mkdir -p $(DIST)etc/init
+	mkdir -p $(DIST)etc/systemd
 	mkdir -p $(DIST)etc/ecix
 
 
 	# Copy config and startup script
-	cp etc/init/* DIST/etc/init/.
+	cp etc/systemd/* DIST/etc/systemd/.
 	cp etc/ecix/* DIST/etc/ecix/.
 	rm -f DIST/etc/ecix/*.local.*
 
diff --git a/VERSION b/VERSION
index 26aaba0..f0bb29e 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.2.0
+1.3.0
diff --git a/etc/init/bird4watcher.conf b/docs/upstart_example/init/bird4watcher.conf
similarity index 100%
rename from etc/init/bird4watcher.conf
rename to docs/upstart_example/init/bird4watcher.conf
diff --git a/etc/init/bird6watcher.conf b/docs/upstart_example/init/bird6watcher.conf
similarity index 100%
rename from etc/init/bird6watcher.conf
rename to docs/upstart_example/init/bird6watcher.conf
diff --git a/etc/init/birdwatcher.conf b/docs/upstart_example/init/birdwatcher.conf
similarity index 100%
rename from etc/init/birdwatcher.conf
rename to docs/upstart_example/init/birdwatcher.conf
diff --git a/etc/systemd/birdwatcher.target b/etc/systemd/birdwatcher.target
new file mode 100644
index 0000000..11f6f41
--- /dev/null
+++ b/etc/systemd/birdwatcher.target
@@ -0,0 +1,6 @@
+[Unit]
+Wants=birdwatcher4.service birdwatcher6.service
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/etc/systemd/birdwatcher4.service b/etc/systemd/birdwatcher4.service
new file mode 100644
index 0000000..fc1bbc9
--- /dev/null
+++ b/etc/systemd/birdwatcher4.service
@@ -0,0 +1,11 @@
+
+[Unit]
+Description=Birdwatcher (IPv4)
+After=network.target
+
+[Service]
+ExecStart=/opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64
+
+[Install]
+WantedBy=multi-user.target
+
diff --git a/etc/systemd/birdwatcher6.service b/etc/systemd/birdwatcher6.service
new file mode 100644
index 0000000..e61c004
--- /dev/null
+++ b/etc/systemd/birdwatcher6.service
@@ -0,0 +1,11 @@
+
+[Unit]
+Description=Birdwatcher (IPv6)
+After=network.target
+
+[Service]
+ExecStart=/opt/ecix/birdwatcher/bin/birdwatcher-linux-amd64 -6
+
+[Install]
+WantedBy=multi-user.target
+