diff -Nru openarena-0.8.1/debian/changelog openarena-0.8.1/debian/changelog
--- openarena-0.8.1/debian/changelog	2009-11-19 17:38:16.000000000 +0100
+++ openarena-0.8.1/debian/changelog	2010-11-06 22:42:56.000000000 +0100
@@ -1,3 +1,10 @@
+openarena (0.8.1-6ubuntu0.1) lucid-proposed; urgency=low
+
+  * Use memmove instead of strcpy for overlapping memory regions.
+    (LP: #554748)
+
+ -- Michał Z. Gołębiowski (m_gol) <mz.goleb@gmail.com>  Sat, 06 Nov 2010 22:42:14 +0100
+
 openarena (0.8.1-6) unstable; urgency=low
 
   * Convert source package to format 3.0 quilt
diff -Nru openarena-0.8.1/debian/control openarena-0.8.1/debian/control
--- openarena-0.8.1/debian/control	2009-11-19 17:36:42.000000000 +0100
+++ openarena-0.8.1/debian/control	2010-11-06 22:41:10.000000000 +0100
@@ -1,7 +1,8 @@
 Source: openarena
 Section: games
 Priority: optional
-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Debian Games Team <pkg-games-devel@lists.alioth.debian.org>
 Uploaders: Bruno "Fuddl" Kleinert <fuddl@debian.org>, Ansgar Burchardt <ansgar@43-1.org>, Gonéri Le Bouder <goneri@rulezlan.org>
 Build-Depends: debhelper (>= 5.0.51), libsdl1.2-dev, libopenal-dev, imagemagick, libcurl4-gnutls-dev, libvorbis-dev, libjpeg62-dev, libspeexdsp-dev
 Standards-Version: 3.8.3
diff -Nru openarena-0.8.1/debian/patches/debian-changes-0.8.1-6ubuntu0.1 openarena-0.8.1/debian/patches/debian-changes-0.8.1-6ubuntu0.1
--- openarena-0.8.1/debian/patches/debian-changes-0.8.1-6ubuntu0.1	1970-01-01 01:00:00.000000000 +0100
+++ openarena-0.8.1/debian/patches/debian-changes-0.8.1-6ubuntu0.1	2010-11-06 22:53:14.000000000 +0100
@@ -0,0 +1,57 @@
+Description: Upstream changes introduced in version 0.8.1-6ubuntu0.1
+ This patch has been created by dpkg-source during the package build.
+ Here's the last changelog entry, hopefully it gives details on why
+ those changes were made:
+ .
+ openarena (0.8.1-6ubuntu0.1) lucid-proposed; urgency=low
+ .
+   * Use memmove instead of strcpy for overlapping memory regions.
+     (LP: #554748)
+ .
+ The person named in the Author field signed this changelog entry.
+Author: Michał Z. Gołębiowski (m_gol) <mz.goleb@gmail.com>
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/554748
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: http://bugs.debian.org/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: <YYYY-MM-DD>
+
+--- openarena-0.8.1.orig/code/botlib/l_script.c
++++ openarena-0.8.1/code/botlib/l_script.c
+@@ -1118,7 +1118,7 @@ void StripDoubleQuotes(char *string)
+ {
+ 	if (*string == '\"')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\"')
+ 	{
+@@ -1135,7 +1135,7 @@ void StripSingleQuotes(char *string)
+ {
+ 	if (*string == '\'')
+ 	{
+-		strcpy(string, string+1);
++		memmove(string, string+1, strlen(string));
+ 	} //end if
+ 	if (string[strlen(string)-1] == '\'')
+ 	{
+--- openarena-0.8.1.orig/code/botlib/l_precomp.c
++++ openarena-0.8.1/code/botlib/l_precomp.c
+@@ -948,7 +948,7 @@ void PC_ConvertPath(char *path)
+ 		if ((*ptr == '\\' || *ptr == '/') &&
+ 				(*(ptr+1) == '\\' || *(ptr+1) == '/'))
+ 		{
+-			strcpy(ptr, ptr+1);
++			memmove(ptr, ptr+1, strlen(ptr));
+ 		} //end if
+ 		else
+ 		{
diff -Nru openarena-0.8.1/debian/patches/series openarena-0.8.1/debian/patches/series
--- openarena-0.8.1/debian/patches/series	2009-11-19 16:23:53.000000000 +0100
+++ openarena-0.8.1/debian/patches/series	2010-11-06 22:53:14.000000000 +0100
@@ -4,3 +4,4 @@
 #20_dont_build_shipped_jpeg.diff
 30_link_against_local_libspeex.diff
 40_kfreebsd.diff
+debian-changes-0.8.1-6ubuntu0.1