diff --git a/at-3.1.8-tomorrow.patch b/at-3.1.8-tomorrow.patch
new file mode 100644
index 0000000..545d4aa
--- /dev/null
+++ b/at-3.1.8-tomorrow.patch
@@ -0,0 +1,13 @@
+Index: at-3.1.8/parsetime.y
+===================================================================
+--- at-3.1.8.orig/parsetime.y
++++ at-3.1.8/parsetime.y
+@@ -375,7 +375,7 @@ parsetime(int argc, char **argv)
+ 		exectime -= 3600;
+ 	    }
+ 	}
+-	if (time_only && (currtime > exectime)) {
++	if (currtime > exectime+1) {
+ 	    exectime += 24*3600;
+ 	}
+         return exectime;
diff --git a/at.changes b/at.changes
index 5c9963b..b87db67 100644
--- a/at.changes
+++ b/at.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb  1 09:49:43 UTC 2011 - vcizek@novell.com
+
+- at now shifts jobs with passed time without a date to tomorrow
+  (bnc#668485)
+
 -------------------------------------------------------------------
 Wed Nov 10 12:51:25 UTC 2010 - coolo@novell.com
 
diff --git a/at.spec b/at.spec
index 1bab4c1..2eade86 100644
--- a/at.spec
+++ b/at.spec
@@ -54,6 +54,7 @@ Patch14:        %{name}-%{version}-pam-session-as-root.patch
 Patch15:        %{name}-%{version}-leak-fix.patch
 #PATCH_FIX-OPENSUSE add proper system users to the deny list
 Patch16:        at-3.1.8-denylist.patch
+Patch17:	%{name}-%{version}-tomorrow.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 PreReq:         %{_sbindir}/useradd %{_sbindir}/groupadd %fillup_prereq %insserv_prereq
 Recommends:     smtp_daemon
@@ -89,6 +90,7 @@ Authors:
 %patch14
 %patch15
 %patch16
+%patch17 -p1
 
 %build
 %{?suse_update_config:%{suse_update_config -f}}