diff --git a/Makefile b/Makefile
index 1b44d5c..d558d19 100644
--- a/Makefile
+++ b/Makefile
@@ -21,14 +21,14 @@ g13_lcd.o: g13.h helper.hpp g13_lcd.cc
 
 g13_stick.o: g13.h helper.hpp g13_stick.cc
 	g++ $(FLAGS) -c g13_stick.cc
-	
+
 g13_keys.o: g13.h helper.hpp g13_keys.cc
 	g++ $(FLAGS) -c g13_keys.cc
 
 helper.o: helper.hpp helper.cpp
 	g++ $(FLAGS) -c helper.cpp
-	
-	
+
+
 g13d: g13_main.o g13.o g13_log.o g13_fonts.o g13_lcd.o g13_stick.o g13_keys.o helper.o
 	g++ -o g13d -std=c++0x \
 		g13_main.o g13.o g13_log.o g13_fonts.o g13_lcd.o g13_stick.o g13_keys.o helper.o \
@@ -39,11 +39,14 @@ g13d: g13_main.o g13.o g13_log.o g13_fonts.o g13_lcd.o g13_stick.o g13_keys.o he
 pbm2lpbm: pbm2lpbm.c
 	g++ -o pbm2lpbm pbm2lpbm.c
 
-package:
-	rm -Rf g13-userspace
-	mkdir g13-userspace
-	cp g13.cc g13.h logo.h Makefile pbm2lpbm.c g13-userspace
-	tar cjf g13-userspace.tbz2 g13-userspace
-	rm -Rf g13-userspace
 clean: 
-	rm -f g13 pbm2lpbm
\ No newline at end of file
+	rm -f g13 pbm2lpbm
+
+install:
+	install -d ${HOME}/.local/bin
+	install -m700 -d ${HOME}/.local/var/g13d
+	install -d ${HOME}/.config/systemd/user
+	cat g13d.service |sed "s,@HOME@,${HOME},g" > ${HOME}/.config/systemd/user/g13d.service
+	install -m755 g13d ${HOME}/.local/bin/g13d
+
+.PHONY: all clean install
diff --git a/g13d.service b/g13d.service
new file mode 100644
index 0000000..f683203
--- /dev/null
+++ b/g13d.service
@@ -0,0 +1,7 @@
+[Unit]
+Description=Logitech g13 daemon
+
+[Service]
+Type=simple
+ExecStart=@HOME@/.local/bin/g13d --pipe_in @HOME@/.local/var/g13d/in --pipe_out @HOME@/.local/var/g13d/out
+Restart=on-failure