diff --git a/README.md b/README.md
index 6fc8aea..6192fa8 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,5 @@
 # libts
 
 Tslib is an abstraction layer for touchscreen panel events, as well as a filter stack for the manipulation of those events. It was created by Russell King, of arm.linux.org.uk. Examples of implemented filters include jitter smoothing and the calibration transform.
-
 Tslib is generally used on embedded devices to provide a common user space interface to touchscreen functionality. It is supported by Kdrive (aka TinyX) and OPIE as well as being used on a number of commercial Linux devices including the Nokia 770.
 
diff --git a/libts.spec b/libts.spec
index 55a09be..a10a197 100644
--- a/libts.spec
+++ b/libts.spec
@@ -1,6 +1,6 @@
 Name:          libts
 Version:       1.0.0.git20110130
-Release:       4mamba
+Release:       5mamba
 Summary:       An abstraction library for touchscreen panel events
 Group:         System/Libraries
 Vendor:        openmamba
@@ -20,7 +20,6 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-root
 
 %description
 Tslib is an abstraction layer for touchscreen panel events, as well as a filter stack for the manipulation of those events. It was created by Russell King, of arm.linux.org.uk. Examples of implemented filters include jitter smoothing and the calibration transform.
-
 Tslib is generally used on embedded devices to provide a common user space interface to touchscreen functionality. It is supported by Kdrive (aka TinyX) and OPIE as well as being used on a number of commercial Linux devices including the Nokia 770.
 
 %package devel
@@ -30,9 +29,7 @@ Requires:      %{name} = %{?epoch:%epoch:}%{version}-%{release}
 
 %description devel
 Tslib is an abstraction layer for touchscreen panel events, as well as a filter stack for the manipulation of those events. It was created by Russell King, of arm.linux.org.uk. Examples of implemented filters include jitter smoothing and the calibration transform.
-
 Tslib is generally used on embedded devices to provide a common user space interface to touchscreen functionality. It is supported by Kdrive (aka TinyX) and OPIE as well as being used on a number of commercial Linux devices including the Nokia 770.
-
 This package contains static libraries and header files need for development.
 
 %prep
@@ -50,7 +47,7 @@ This package contains static libraries and header files need for development.
 
 ln -s libts-1.0.so.0 %{buildroot}%{_libdir}/libts-1.0.so
 
-install -D -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/ts-calibrate
+#install -D -m0755 %{SOURCE1} %{buildroot}%{_initrddir}/ts-calibrate
 install -m0644 %{SOURCE2} %{buildroot}%{_sysconfdir}/ts-calibrate.conf.sample
 install -D -m0644 %{SOURCE3} %{buildroot}/lib/systemd/system/ts-calibrate.service
 
@@ -78,7 +75,6 @@ exit 0
 %defattr(-,root,root)
 %{_sysconfdir}/ts.conf
 %{_sysconfdir}/ts-calibrate.conf.sample
-%{_initrddir}/ts-calibrate
 %{_bindir}/ts_calibrate
 %{_bindir}/ts_harvest
 %{_bindir}/ts_print
@@ -101,6 +97,9 @@ exit 0
 %doc ChangeLog README
 
 %changelog
+* Fri Jun 27 2014 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.0.git20110130-5mamba
+- remove sysv5 initscript and fix systemd service file
+
 * Sun Apr 14 2013 Silvan Calarco <silvan.calarco@mambasoft.it> 1.0.0.git20110130-4mamba
 - fix wrong file provided as ts-calibrate.service
 
diff --git a/ts-calibrate.service b/ts-calibrate.service
index 994d8da..cba7c71 100644
--- a/ts-calibrate.service
+++ b/ts-calibrate.service
@@ -4,10 +4,11 @@ DefaultDependencies=no
 Before=graphical.target
 
 [Service]
+ConditionPathExists=/etc/ts-calibrate.conf !/etc/pointercal
 Type=oneshot
 RemainAfterExit=yes
 ExecStart=/usr/bin/ts_calibrate
-EnvironmentFile=/etc/ts-calibrate.conf
+EnvironmentFile=-/etc/ts-calibrate.conf
 
 [Install]
 WantedBy=graphical.target