diff --git a/Makefile b/Makefile
index 2181178..df54350 100644
--- a/Makefile
+++ b/Makefile
@@ -35,10 +35,33 @@ RemoteCommand:	Log.o RemoteCommand.o UDPSocket.o
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
-install:
+.PHONY install:
+install: all
 		install -m 755 MMDVMHost /usr/local/bin/
 		install -m 755 RemoteCommand /usr/local/bin/
 
+.PHONY install-service:
+install-service: install /etc/MMDVM.ini
+		@useradd --user-group -M --system mmdvm --shell /bin/false || true
+		@usermod --groups dialout --append mmdvm || true
+		@mkdir /var/log/mmdvm || true
+		@chown mmdvm:mmdvm /var/log/mmdvm
+		@cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/
+		@systemctl enable mmdvmhost.service
+
+/etc/MMDVM.ini:
+		@cp -n MMDVM.ini /etc/MMDVM.ini
+		@sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini
+		@sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini
+		@chown mmdvm:mmdvm /etc/MMDVM.ini
+
+.PHONY uninstall-service:
+uninstall-service:
+		@systemctl stop mmdvmhost.service || true
+		@systemctl disable mmdvmhost.service || true
+		@rm -f /usr/local/bin/MMDVMHost || true
+		@rm -f /lib/systemd/system/mmdvmhost.service || true
+
 clean:
 		$(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h
 
diff --git a/Makefile.Pi b/Makefile.Pi
index 7123530..3b14a13 100644
--- a/Makefile.Pi
+++ b/Makefile.Pi
@@ -34,10 +34,33 @@ RemoteCommand:	Log.o RemoteCommand.o UDPSocket.o
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
-install:
+.PHONY install:
+install: all
 		install -m 755 MMDVMHost /usr/local/bin/
 		install -m 755 RemoteCommand /usr/local/bin/
 
+.PHONY install-service:
+install-service: install /etc/MMDVM.ini
+		@useradd --user-group -M --system mmdvm --shell /bin/false || true
+		@usermod --groups dialout --append mmdvm || true
+		@mkdir /var/log/mmdvm || true
+		@chown mmdvm:mmdvm /var/log/mmdvm
+		@cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/
+		@systemctl enable mmdvmhost.service
+
+/etc/MMDVM.ini:
+		@cp -n MMDVM.ini /etc/MMDVM.ini
+		@sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini
+		@sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini
+		@chown mmdvm:mmdvm /etc/MMDVM.ini
+
+.PHONY uninstall-service:
+uninstall-service:
+		@systemctl stop mmdvmhost.service || true
+		@systemctl disable mmdvmhost.service || true
+		@rm -f /usr/local/bin/MMDVMHost || true
+		@rm -f /lib/systemd/system/mmdvmhost.service || true
+
 clean:
 		$(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h
 
diff --git a/Makefile.Pi.Adafruit b/Makefile.Pi.Adafruit
index 4c5e9f5..149d9ba 100644
--- a/Makefile.Pi.Adafruit
+++ b/Makefile.Pi.Adafruit
@@ -35,10 +35,33 @@ RemoteCommand:	Log.o RemoteCommand.o UDPSocket.o
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
-install:
+.PHONY install:
+install: all
 		install -m 755 MMDVMHost /usr/local/bin/
 		install -m 755 RemoteCommand /usr/local/bin/
 
+.PHONY install-service:
+install-service: install /etc/MMDVM.ini
+		@useradd --user-group -M --system mmdvm --shell /bin/false || true
+		@usermod --groups dialout --append mmdvm || true
+		@mkdir /var/log/mmdvm || true
+		@chown mmdvm:mmdvm /var/log/mmdvm
+		@cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/
+		@systemctl enable mmdvmhost.service
+
+/etc/MMDVM.ini:
+		@cp -n MMDVM.ini /etc/MMDVM.ini
+		@sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini
+		@sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini
+		@chown mmdvm:mmdvm /etc/MMDVM.ini
+
+.PHONY uninstall-service:
+uninstall-service:
+		@systemctl stop mmdvmhost.service || true
+		@systemctl disable mmdvmhost.service || true
+		@rm -f /usr/local/bin/MMDVMHost || true
+		@rm -f /lib/systemd/system/mmdvmhost.service || true
+
 clean:
 		$(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h
 
diff --git a/Makefile.Pi.HD44780 b/Makefile.Pi.HD44780
index 186b22f..85044ef 100644
--- a/Makefile.Pi.HD44780
+++ b/Makefile.Pi.HD44780
@@ -35,10 +35,33 @@ RemoteCommand:	Log.o RemoteCommand.o UDPSocket.o
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
-install:
+.PHONY install:
+install: all
 		install -m 755 MMDVMHost /usr/local/bin/
 		install -m 755 RemoteCommand /usr/local/bin/
 
+.PHONY install-service:
+install-service: install /etc/MMDVM.ini
+		@useradd --user-group -M --system mmdvm --shell /bin/false || true
+		@usermod --groups dialout --append mmdvm || true
+		@mkdir /var/log/mmdvm || true
+		@chown mmdvm:mmdvm /var/log/mmdvm
+		@cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/
+		@systemctl enable mmdvmhost.service
+
+/etc/MMDVM.ini:
+		@cp -n MMDVM.ini /etc/MMDVM.ini
+		@sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini
+		@sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini
+		@chown mmdvm:mmdvm /etc/MMDVM.ini
+
+.PHONY uninstall-service:
+uninstall-service:
+		@systemctl stop mmdvmhost.service || true
+		@systemctl disable mmdvmhost.service || true
+		@rm -f /usr/local/bin/MMDVMHost || true
+		@rm -f /lib/systemd/system/mmdvmhost.service || true
+
 clean:
 		$(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h
 
diff --git a/Makefile.Pi.OLED b/Makefile.Pi.OLED
index 34b2a9e..0a3d7bb 100644
--- a/Makefile.Pi.OLED
+++ b/Makefile.Pi.OLED
@@ -35,10 +35,33 @@ RemoteCommand:	Log.o RemoteCommand.o UDPSocket.o
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
-install:
+.PHONY install:
+install: all
 		install -m 755 MMDVMHost /usr/local/bin/
 		install -m 755 RemoteCommand /usr/local/bin/
 
+.PHONY install-service:
+install-service: install /etc/MMDVM.ini
+		@useradd --user-group -M --system mmdvm --shell /bin/false || true
+		@usermod --groups dialout --append mmdvm || true
+		@mkdir /var/log/mmdvm || true
+		@chown mmdvm:mmdvm /var/log/mmdvm
+		@cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/
+		@systemctl enable mmdvmhost.service
+
+/etc/MMDVM.ini:
+		@cp -n MMDVM.ini /etc/MMDVM.ini
+		@sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini
+		@sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini
+		@chown mmdvm:mmdvm /etc/MMDVM.ini
+
+.PHONY uninstall-service:
+uninstall-service:
+		@systemctl stop mmdvmhost.service || true
+		@systemctl disable mmdvmhost.service || true
+		@rm -f /usr/local/bin/MMDVMHost || true
+		@rm -f /lib/systemd/system/mmdvmhost.service || true
+
 clean:
 		$(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h
 
diff --git a/Makefile.Pi.PCF8574 b/Makefile.Pi.PCF8574
index bda859b..deda9e3 100644
--- a/Makefile.Pi.PCF8574
+++ b/Makefile.Pi.PCF8574
@@ -36,10 +36,33 @@ RemoteCommand:	Log.o RemoteCommand.o UDPSocket.o
 %.o: %.cpp
 		$(CXX) $(CFLAGS) -c -o $@ $<
 
-install:
+.PHONY install:
+install: all
 		install -m 755 MMDVMHost /usr/local/bin/
 		install -m 755 RemoteCommand /usr/local/bin/
 
+.PHONY install-service:
+install-service: install /etc/MMDVM.ini
+		@useradd --user-group -M --system mmdvm --shell /bin/false || true
+		@usermod --groups dialout --append mmdvm || true
+		@mkdir /var/log/mmdvm || true
+		@chown mmdvm:mmdvm /var/log/mmdvm
+		@cp ./linux/systemd/mmdvmhost.service /lib/systemd/system/
+		@systemctl enable mmdvmhost.service
+
+/etc/MMDVM.ini:
+		@cp -n MMDVM.ini /etc/MMDVM.ini
+		@sed -i 's/FilePath=./FilePath=\/var\/log\/mmdvm\//' /etc/MMDVM.ini
+		@sed -i 's/Daemon=0/Daemon=1/' /etc/MMDVM.ini
+		@chown mmdvm:mmdvm /etc/MMDVM.ini
+
+.PHONY uninstall-service:
+uninstall-service:
+		@systemctl stop mmdvmhost.service || true
+		@systemctl disable mmdvmhost.service || true
+		@rm -f /usr/local/bin/MMDVMHost || true
+		@rm -f /lib/systemd/system/mmdvmhost.service || true
+
 clean:
 		$(RM) MMDVMHost RemoteCommand *.o *.d *.bak *~ GitVersion.h
 
diff --git a/linux/init/README.md b/linux/pi-star/init/README.md
similarity index 100%
rename from linux/init/README.md
rename to linux/pi-star/init/README.md
diff --git a/linux/init/mmdvmhost b/linux/pi-star/init/mmdvmhost
similarity index 100%
rename from linux/init/mmdvmhost
rename to linux/pi-star/init/mmdvmhost
diff --git a/linux/systemd/README.md b/linux/pi-star/systemd/README.md
similarity index 100%
rename from linux/systemd/README.md
rename to linux/pi-star/systemd/README.md
diff --git a/linux/pi-star/systemd/mmdvmhost.service b/linux/pi-star/systemd/mmdvmhost.service
new file mode 100644
index 0000000..a4de9f3
--- /dev/null
+++ b/linux/pi-star/systemd/mmdvmhost.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=MMDVMHost Radio Servce
+After=syslog.target network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/local/sbin/mmdvmhost_service start
+ExecStop=/usr/local/sbin/mmdvmhost_service stop
+ExecReload=/usr/local/sbin/mmdvmhost_service restart
+
+[Install]
+WantedBy=multi-user.target
diff --git a/linux/systemd/mmdvmhost.timer b/linux/pi-star/systemd/mmdvmhost.timer
similarity index 100%
rename from linux/systemd/mmdvmhost.timer
rename to linux/pi-star/systemd/mmdvmhost.timer
diff --git a/linux/systemd/mmdvmhost_service b/linux/pi-star/systemd/mmdvmhost_service
similarity index 100%
rename from linux/systemd/mmdvmhost_service
rename to linux/pi-star/systemd/mmdvmhost_service
diff --git a/linux/systemd/mmdvmhost.service b/linux/systemd/mmdvmhost.service
index a4de9f3..27ca4ee 100644
--- a/linux/systemd/mmdvmhost.service
+++ b/linux/systemd/mmdvmhost.service
@@ -1,12 +1,12 @@
 [Unit]
-Description=MMDVMHost Radio Servce
+Description=MMDVMHost Radio Service
 After=syslog.target network.target
 
 [Service]
+User=mmdvm
 Type=forking
-ExecStart=/usr/local/sbin/mmdvmhost_service start
-ExecStop=/usr/local/sbin/mmdvmhost_service stop
-ExecReload=/usr/local/sbin/mmdvmhost_service restart
+ExecStart=/usr/local/bin/MMDVMHost
+Restart=on-abnormal
 
 [Install]
 WantedBy=multi-user.target