diff --git a/CMakeLists.txt b/CMakeLists.txt
index bd78029..cccb4dc 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -42,7 +42,6 @@ target_link_libraries(mympd ${LIBMPDCLIENT_LIBRARY} ${OPENSSL_LIBRARIES})
 install(TARGETS mympd DESTINATION bin)
 install(FILES contrib/mympd.1 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/man/man1)
 install(FILES contrib/crcert.sh DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/)
-install(FILES contrib/mympd.service DESTINATION ${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/)
 install(FILES contrib/mympd.conf DESTINATION /etc/${PROJECT_NAME}/)
 install(FILES htdocs/mympd.webmanifest DESTINATION share/${PROJECT_NAME}/htdocs/)
 install(FILES dist/htdocs/index.html DESTINATION share/${PROJECT_NAME}/htdocs/)
diff --git a/README.md b/README.md
index 5a902be..e612fd0 100644
--- a/README.md
+++ b/README.md
@@ -22,7 +22,7 @@ This fork provides a reworked ui based on Bootstrap 4, a modernized backend and
  - Playlist management
  - Advanced search
  - Progressiv Web App enabled
- - Local coverart support
+ - Local coverart support (Albums and Streams)
  - HTTP stream support
  - Local playback of mpd http stream (html5 audio api)
  - Play statistics and song voting (uses mpd stickers)
diff --git a/contrib/mympd.service b/debian/mympd.service
similarity index 100%
rename from contrib/mympd.service
rename to debian/mympd.service
diff --git a/mkrelease.sh b/mkrelease.sh
index 48d8202..0034abf 100755
--- a/mkrelease.sh
+++ b/mkrelease.sh
@@ -64,9 +64,9 @@ fi
 echo "Installing systemd service"
 if [ -d /etc/systemd/system ]
 then
-  if [ contrib/mympd.service -nt /etc/systemd/system/mympd.service ]
+  if [ debian/mympd.service -nt /etc/systemd/system/mympd.service ]
   then
-    sudo cp contrib/mympd.service /etc/systemd/system/
+    sudo cp debian/mympd.service /etc/systemd/system/
     sudo systemctl daemon-reload
   fi
   sudo systemctl enable mympd  
diff --git a/myMPD.spec b/myMPD.spec
index 406361d..082ee5f 100644
--- a/myMPD.spec
+++ b/myMPD.spec
@@ -17,13 +17,22 @@ BuildRequires:  unzip
 BuildRequires:	libmpdclient-devel
 BuildRequires:	libmpdclient2
 BuildRequires:	pkgconfig
-BuildRequires:	openssl
 BuildRequires:	openssl-devel
+BuildRequires:	systemd
+%if 0%{?suse_version} >= 1210
+BuildRequires: systemd-rpm-macros
+%endif
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
+%{?systemd_requires}
 
 %description 
 myMPD is a standalone and mobile friendly web mpdclient.
 
+%pre
+%if 0%{?suse_version}
+%service_add_pre mympd.service
+%endif
+
 %prep 
 %setup -q -n %{name}-%{version}
 
@@ -37,6 +46,28 @@ make
 cd release
 make install DESTDIR=%{buildroot}
 chmod 755 %{buildroot}/usr/share/mympd/crcert.sh
+install -D -m 644 debian/mympd.service %{buildroot}%{_unitdir}/mympd.service
+
+%post
+%if 0%{?rhel_version} || 0%{?centos_version}
+%systemd_post mympd.service
+%else
+%service_add_post mympd.service
+%endif
+
+%preun
+%if 0%{?rhel_version} || 0%{?centos_version}
+%systemd_preun mympd.service
+%else
+%service_del_preun mympd.service
+%endif
+
+%postun
+%if 0%{?rhel_version} || 0%{?centos_version}
+%systemd_postun mympd.service
+%else
+%service_del_postun mympd.service
+%endif
 
 %files 
 %defattr(-,root,root,-)
@@ -46,6 +77,7 @@ chmod 755 %{buildroot}/usr/share/mympd/crcert.sh
 %config /etc/mympd
 /usr/share/man/man1/mympd.1.gz
 /var/lib/mympd
+%{_unitdir}/mympd.service
 
 %changelog
 * Tue Aug 28 2018 Juergen Mang <mail@jcgames.de> - master