diff --git a/psmisc-22.15-timeout.patch b/psmisc-22.15-timeout.patch
index 24e2a28..4a32665 100644
--- a/psmisc-22.15-timeout.patch
+++ b/psmisc-22.15-timeout.patch
@@ -117,10 +117,10 @@ index 476fdf1..374a17d 100644
  /*
   * Use /proc/self/mountinfo of modern linux system to determine
 diff --git a/src/timeout.c b/src/timeout.c
-index e69de29..e79774b 100644
+index e69de29..bef93b3 100644
 --- a/src/timeout.c
 +++ b/src/timeout.c
-@@ -0,0 +1,260 @@
+@@ -0,0 +1,265 @@
 +/*
 + * timout.c	Advanced timeout handling for file system calls
 + *		to avoid deadlocks on remote file shares.
@@ -204,6 +204,11 @@ index e69de29..e79774b 100644
 +# define attribute(attr)	__attribute__(attr)
 +#endif
 +
++#if defined __GNUC__
++# undef strcpy
++# define strcpy(d,s)		__builtin_strcpy((d),(s))   /* Without boundary check please */
++#endif
++
 +/*
 + * The structure used for communication between the processes
 + */
diff --git a/psmisc.changes b/psmisc.changes
index 97d9d2d..fe5be08 100644
--- a/psmisc.changes
+++ b/psmisc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Oct 11 15:36:40 UTC 2011 - werner@suse.de
+
+- Use __builtin___strcpy_ instead of __builtin___strcpy_chk to avoid
+  trouble with char path[0] tag in struct handle (bnc#723304)
+
 -------------------------------------------------------------------
 Fri Oct  7 14:08:31 UTC 2011 - werner@suse.de