diff --git a/serviio.rpmlintrc b/serviio.rpmlintrc
new file mode 100644
index 0000000..f699ffc
--- /dev/null
+++ b/serviio.rpmlintrc
@@ -0,0 +1,4 @@
+addFilter("W: jar-not-indexed")
+addFilter("W: uncompressed-zip")
+addFilter("E: explicit-lib-dependency")
+addFilter("E: no-binary")
diff --git a/serviio.spec b/serviio.spec
index 0765ef2..43141fd 100644
--- a/serviio.spec
+++ b/serviio.spec
@@ -1,3 +1,7 @@
+%define		debug %nil
+%define		debug_package %nil
+
+
 Summary:        A free media server
 Name:           serviio
 Version:        2.0
@@ -6,14 +10,15 @@ License:        Freeware
 Url:            http://www.serviio.org/
 Group:          Video
 Source0:        http://download.serviio.org/releases/%{name}-%{version}-linux.tar.gz
-Source1:        serviio
 Source2:        serviio.service
-BuildRequires:  tar gzip
+Source1000:	%{name}.rpmlintrc
+BuildRequires:  tar
+BuildRequires:	gzip
 BuildRequires:  systemd
 Requires:       java >= 1.7.0
 Requires:       ffmpeg 
-Requires:       librtmp
-Requires:       libass
+Requires:       %{_lib}rtmp
+Requires:       %{_lib}ass
 Requires:       x264
 Requires:       lame
 Requires:       rtmpdump >= 2.4
@@ -30,33 +35,34 @@ or mobile phone) on your connected home network.
 
 %install
 install -d %{buildroot}/%{_bindir}
-cp bin/*.sh %{buildroot}/%{_bindir}
+
+install -Dm0755 bin/*.sh %{buildroot}/%{_bindir}
+
 for dir in config lib library plugins; do 
-        install -d %{buildroot}/usr/share/java/serviio/$dir
-        cp $dir/* %{buildroot}/usr/share/java/serviio/$dir
-       
+        install -d %{buildroot}%{_datadir}/java/%{name}/$dir
+        cp $dir/* %{buildroot}%{_datadir}/java/%{name}/$dir
 done
-install -d %{buildroot}/usr/share/java/serviio/log
-install -D -m 755 %{SOURSE1} %{buildroot}/etc/init.d/serviio
-install -D -m 644 %{SOURSE2} %{buildroot}%{_unitdir}/serviio.service
-%pre
-%systemd_post serviio.service
+
+install -d %{buildroot}%{_datadir}/java/%{name}/log
+install -D -m 644 %{SOURCE2} %{buildroot}%{_unitdir}/%{name}.service
+
 %post
-%systemd_post serviio.service
+%systemd_post %{name}.service
+
+%preun
+%systemd_preun %{name}.service
+
+%postun
+%systemd_postun_with_restart %{name}.service
 
 %files
-%doc legal/*
+%doc README.txt LICENCE.txt legal/*
 %{_bindir}/serviio.sh
 %{_bindir}/serviio-console.sh
 %{_unitdir}/serviio.service
-%dir %{_datadir}/java/serviio
-%dir %{_datadir}/java/serviio/config
-%dir %{_datadir}/java/serviio/lib
-%dir %{_datadir}/java/serviio/plugins
 %{_datadir}/java/serviio/config/*.xml
 %{_datadir}/java/serviio/lib/*.jar
 %{_datadir}/java/serviio/plugins/*.txt
 %{_datadir}/java/serviio/config/serviio.jks
-%{_unitdir}/serviio
-%attr(775,%{name},%{name}) %{_datadir}/java/serviio/library
-%attr(775,%{name},%{name}) %{_datadir}/java/serviio/log
\ No newline at end of file
+%{_datadir}/java/serviio/library
+%{_datadir}/java/serviio/log
\ No newline at end of file