diff --git a/make-3.81-strcpy-overlap.patch b/make-3.81-strcpy-overlap.patch
new file mode 100644
index 0000000..41723ea
--- /dev/null
+++ b/make-3.81-strcpy-overlap.patch
@@ -0,0 +1,16 @@
+Index: job.c
+===================================================================
+RCS file: /sources/make/make/job.c,v
+retrieving revision 1.193
+diff -u -r1.193 job.c
+--- job.c	9 Jun 2009 15:35:38 -0000	1.193
++++ job.c	31 Jul 2009 11:42:16 -0000
+@@ -1600,7 +1600,7 @@
+       /* There are no more references in this line to worry about.
+ 	 Copy the remaining uninteresting text to the output.  */
+       if (out != in)
+-	strcpy (out, in);
++	memmove (out, in, strlen (in) + 1);
+ 
+       /* Finally, expand the line.  */
+       lines[i] = allocated_variable_expand_for_file (cmds->command_lines[i],
diff --git a/make.spec b/make.spec
index 7583ace..091aa80 100644
--- a/make.spec
+++ b/make.spec
@@ -3,7 +3,7 @@ Summary: A GNU tool which simplifies the build process for users
 Name: make
 Epoch: 1
 Version: 3.81
-Release: 16%{?dist}
+Release: 17%{?dist}
 License: GPLv2+
 Group: Development/Tools
 URL: http://www.gnu.org/software/make/
@@ -17,6 +17,7 @@ Patch8: make-3.81-rlimit.patch
 Patch9: make-3.81-newlines.patch
 Patch10: make-3.81-jobserver.patch
 Patch11: make-3.81-fdleak.patch
+Patch12: make-3.81-strcpy-overlap.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 Requires(post): /sbin/install-info
 Requires(preun): /sbin/install-info
@@ -40,6 +41,7 @@ makefile.
 %patch9 -p1
 %patch10 -p1
 %patch11 -p1
+%patch12 -p0
 
 %build
 %configure
@@ -78,6 +80,11 @@ fi
 %{_infodir}/*.info*
 
 %changelog
+* Fri Jul 31 2009 Petr Machata <pmachata@redhat.com> - 1:3.81-17
+- Replace the use of strcpy on overlapping areas with memmove.  It's
+  possible that this ...
+- Resolves: #514721
+
 * Sat Jul 25 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:3.81-16
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild