diff --git a/openvpn.changes b/openvpn.changes
index a71d90d..7076a4f 100644
--- a/openvpn.changes
+++ b/openvpn.changes
@@ -1,7 +1,13 @@
 -------------------------------------------------------------------
 Tue Apr 23 10:22:32 UTC 2013 - mt@suse.de
 
-- Fixed GID to root in openvpn-tmpfile.conf, there is no openvpn group.
+- Fixed to enable systemd support in configure
+- Fixed to install the service template correctly as openvpn@.service.
+  Use "systemctl enable openvpn@foo.service" to enable instance using
+  /etc/openvpn/foo.conf.
+- Fixed openvpn-tmpfile.conf to use GID root, there is no openvpn group.
+- Disabled all systemd post install macros trying to use not existing
+  openvpn.service file.
 
 -------------------------------------------------------------------
 Tue Mar 26 14:38:48 UTC 2013 - aj@suse.com
diff --git a/openvpn.service b/openvpn.service
index 4bda941..6e05253 100644
--- a/openvpn.service
+++ b/openvpn.service
@@ -1,14 +1,14 @@
 [Unit]
-Description=OpenVPN Robust And Highly Flexible Tunneling Application On %I
+Description=OpenVPN Robust And Highly Flexible Tunneling Application Instance using %I.conf
 After=syslog.target network.target
 
 [Service]
-PrivateTmp=true
 Type=forking
+PrivateTmp=true
 PIDFile=/var/run/openvpn/%i.pid
-ExecStart=/usr/sbin/openvpn --daemon --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf
+ExecStart=/usr/sbin/openvpn --daemon --suppress-timestamps --writepid /var/run/openvpn/%i.pid --cd /etc/openvpn/ --config %i.conf
+ExecReload=/sbin/killproc -p /var/run/openvpn/%i.pid -HUP /usr/sbin/openvpn
 
 [Install]
 WantedBy=multi-user.target
 
-
diff --git a/openvpn.spec b/openvpn.spec
index 026f7c1..75ae8b6 100644
--- a/openvpn.spec
+++ b/openvpn.spec
@@ -132,14 +132,15 @@ find contrib sample -type f -perm +100 \
 export CFLAGS="$RPM_OPT_FLAGS -W -Wall -fno-strict-aliasing"
 export LDFLAGS
 %configure \
-	--enable-iproute2                   \
-	--enable-x509-alt-username          \
-	--enable-password-save              \
-    --enable-plugins                    \
-    --enable-plugin-down-root           \
-    --enable-plugin-auth-pam            \
-	--with-lzo-headers=%_includedir/lzo \
-    CFLAGS="$CFLAGS -fPIE $PLUGIN_DEFS" \
+	--enable-iproute2		\
+	--enable-x509-alt-username	\
+	--enable-password-save		\
+	--enable-systemd		\
+	--enable-plugins		\
+	--enable-plugin-down-root	\
+	--enable-plugin-auth-pam	\
+	--with-lzo-headers=%_includedir/lzo	\
+	CFLAGS="$CFLAGS -fPIE $PLUGIN_DEFS"	\
 	LDFLAGS="$LDFLAGS -pie -lpam -rdynamic -Wl,-rpath,%{_libdir}/%{name}/plugin/lib"
 make
 
@@ -150,7 +151,7 @@ mkdir -p $RPM_BUILD_ROOT/%{_sysconfdir}/openvpn
 mkdir -p $RPM_BUILD_ROOT/%{_localstatedir}/run/openvpn
 mkdir -p $RPM_BUILD_ROOT/%{_datadir}/openvpn
 %if %{with_systemd}
-install -D -m 644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}.service
+install -D -m 644 $RPM_SOURCE_DIR/%{name}.service %{buildroot}/%{_unitdir}/%{name}@.service
 # tmpfiles.d
 mkdir -p %{buildroot}%{_libexecdir}/tmpfiles.d
 install -m 0644 $RPM_SOURCE_DIR/%{name}-tmpfile.conf %{buildroot}%{_libexecdir}/tmpfiles.d/%{name}.conf
@@ -170,23 +171,21 @@ install -m 755 $RPM_SOURCE_DIR/client-netconfig.down sample/sample-scripts/clien
 rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name}
 
 %post
-%if %{with_systemd}
-%service_add_post %{name}.service
-%else
+%if ! %{with_systemd}
+#service_add_post #{name}@.service
+#else
 %{?fillup_and_insserv:%fillup_and_insserv}
 %endif
 
 %preun
-%if %{with_systemd}
-%service_del_preun %{name}.service
+%if ! %{with_systemd}
+#service_del_preun #{name}@.service
 %else
 %{?stop_on_removal:%stop_on_removal openvpn}
 %endif
 
 %postun
-%if %{with_systemd}
-%service_del_postun %{name}.service
-%else
+%if ! %{with_systemd}
 %{?insserv_cleanup:%insserv_cleanup}
 %endif
 
@@ -203,7 +202,7 @@ rm -rf $RPM_BUILD_ROOT%{_datadir}/doc/{OpenVPN,%name}
 %doc %{_mandir}/man8/openvpn.8.gz
 %config(noreplace) %{_sysconfdir}/openvpn/
 %if %{with_systemd}
-%{_unitdir}/%{name}.service
+%{_unitdir}/%{name}@.service
 %{_libexecdir}/tmpfiles.d/%{name}.conf
 %else
 %config %{_sysconfdir}/init.d/openvpn