diff --git a/ChangeLog b/ChangeLog
index d100601af..871409c2f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2003-05-27  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strdup): Use memcpy instead of
+	strcpy. (#106988, Christian Biere)
+
 2003-05-23  Noah Levitt  <nlevitt@columbia.edu>
 
 	* glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427).
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index d100601af..871409c2f 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2003-05-27  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strdup): Use memcpy instead of
+	strcpy. (#106988, Christian Biere)
+
 2003-05-23  Noah Levitt  <nlevitt@columbia.edu>
 
 	* glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427).
diff --git a/ChangeLog.pre-2-12 b/ChangeLog.pre-2-12
index d100601af..871409c2f 100644
--- a/ChangeLog.pre-2-12
+++ b/ChangeLog.pre-2-12
@@ -1,3 +1,8 @@
+2003-05-27  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strdup): Use memcpy instead of
+	strcpy. (#106988, Christian Biere)
+
 2003-05-23  Noah Levitt  <nlevitt@columbia.edu>
 
 	* glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427).
diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index d100601af..871409c2f 100644
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,8 @@
+2003-05-27  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strdup): Use memcpy instead of
+	strcpy. (#106988, Christian Biere)
+
 2003-05-23  Noah Levitt  <nlevitt@columbia.edu>
 
 	* glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427).
diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index d100601af..871409c2f 100644
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,8 @@
+2003-05-27  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strdup): Use memcpy instead of
+	strcpy. (#106988, Christian Biere)
+
 2003-05-23  Noah Levitt  <nlevitt@columbia.edu>
 
 	* glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427).
diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index d100601af..871409c2f 100644
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2003-05-27  Matthias Clasen  <maclas@gmx.de>
+
+	* glib/gstrfuncs.c (g_strdup): Use memcpy instead of
+	strcpy. (#106988, Christian Biere)
+
 2003-05-23  Noah Levitt  <nlevitt@columbia.edu>
 
 	* glib/gutf8.c: Fix typo in UNICODE_VALID (related to #107427).
diff --git a/glib/gstrfuncs.c b/glib/gstrfuncs.c
index b89f143fb..57f532c8f 100644
--- a/glib/gstrfuncs.c
+++ b/glib/gstrfuncs.c
@@ -83,11 +83,13 @@ gchar*
 g_strdup (const gchar *str)
 {
   gchar *new_str;
+  gsize length;
 
   if (str)
     {
-      new_str = g_new (char, strlen (str) + 1);
-      strcpy (new_str, str);
+      length = strlen (str) + 1;
+      new_str = g_new (char, length);
+      memcpy (new_str, str, length);
     }
   else
     new_str = NULL;