diff --git a/at-piddir.patch b/at-piddir.patch
new file mode 100644
index 0000000..f35d8ec
--- /dev/null
+++ b/at-piddir.patch
@@ -0,0 +1,10 @@
+--- configure.ac.orig
++++ configure.ac
+@@ -136,6 +136,7 @@ elif test -d /usr/run ; then
+ else
+     PIDDIR="$ETCDIR"
+ fi
++PIDDIR=/run
+ AC_DEFINE_UNQUOTED(PIDFILE, "$PIDDIR/atd.pid", [What is the name of our PID file?])
+ AC_MSG_RESULT($PIDDIR)
+ 
diff --git a/at.changes b/at.changes
index d455609..9d63379 100644
--- a/at.changes
+++ b/at.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Sat Jul 13 00:09:02 UTC 2013 - crrodriguez@opensuse.org
+
+- systemd: start as non-forking service 
+- systemd: start after systemd-user-sessions.service
+
+-------------------------------------------------------------------
+Sat Jul 13 00:05:41 UTC 2013 - crrodriguez@opensuse.org
+
+- Use /run not /var/run to store the pid file 
+
 -------------------------------------------------------------------
 Thu Jun 20 01:52:46 UTC 2013 - crrodriguez@opensuse.org
 
diff --git a/at.spec b/at.spec
index 642c631..e74256d 100644
--- a/at.spec
+++ b/at.spec
@@ -59,6 +59,8 @@ Patch19:        %{name}-3.1.8-jobdir-mtime.patch
 Patch20:        at-parse-suse-sysconfig.patch
 #PATCH-FIX-UPSTREAM fix makefile dependencies
 Patch21:        at-makefile-deps.patch
+#PATCH-FIX-OPENSUSE Set pid dir to /run not /var/run
+Patch22:        at-piddir.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %{_sbindir}/useradd %{_sbindir}/groupadd %fillup_prereq %insserv_prereq
 PreReq:         permissions
@@ -93,7 +95,7 @@ This program allows you to run jobs at specified times.
 %patch19
 %patch20 -p1
 %patch21 -p1
-
+%patch22
 %build
 rm -fv y.tab.c y.tab.h lex.yy.c lex.yy.o y.tab.o
 autoreconf -fiv
diff --git a/atd.service b/atd.service
index 06eba38..c0a917f 100644
--- a/atd.service
+++ b/atd.service
@@ -1,9 +1,9 @@
 [Unit]
 Description=Execution Queue Daemon
+After=systemd-user-sessions.service
 
 [Service]
-ExecStart=/usr/sbin/atd
-Type=forking
+ExecStart=/usr/sbin/atd -f
 
 [Install]
 WantedBy=multi-user.target