diff --git a/src/m_pd.h b/src/m_pd.h
index 3e9f49e5a3a34ef6c3afcd33115ce9b7793029d2..2a9a1dafeaf3342ee1252ca64a7e9a54061ca22a 100644
--- a/src/m_pd.h
+++ b/src/m_pd.h
@@ -11,7 +11,7 @@ extern "C" {
 #define PD_MAJOR_VERSION 0
 #define PD_MINOR_VERSION 41
 #define PD_BUGFIX_VERSION 0
-#define PD_TEST_VERSION "test08"
+#define PD_TEST_VERSION "test09"
 
 /* old name for "MSW" flag -- we have to take it for the sake of many old
 "nmakefiles" for externs, which will define NT and not MSW */
diff --git a/src/s_main.c b/src/s_main.c
index 362b5ce18c1833bb490906a02e8c390bd4bd37ea..002866d51f0b16b876a34e5915dc58657f78b47b 100644
--- a/src/s_main.c
+++ b/src/s_main.c
@@ -822,14 +822,16 @@ int sys_argparse(int argc, char **argv)
         else if (!strcmp(*argv, "-schedlib"))
         {
             sys_externalschedlib = 1;
-            strcpy(sys_externalschedlibname, argv[1]);
+            strncpy(sys_externalschedlibname, argv[1],
+                sizeof(sys_externalschedlibname) - 1);
             argv += 2;
             argc -= 2;
         }
         else if (!strcmp(*argv, "-extraflags"))
         {
             sys_extraflags = 1;
-            strcpy(sys_extraflagsstring, argv[1]);
+            strncpy(sys_extraflagsstring, argv[1],
+                sizeof(sys_extraflagsstring) - 1);
             argv += 2;
             argc -= 2;
         }