diff --git a/cde/programs/dtwm/WmHelp.c b/cde/programs/dtwm/WmHelp.c
index 8aa993d6c..b7ec15130 100644
--- a/cde/programs/dtwm/WmHelp.c
+++ b/cde/programs/dtwm/WmHelp.c
@@ -2060,7 +2060,7 @@ SaveHelpResources(
     char *wsName;
     char workspaces[MAXWMPATH+1];
 
-    char buffer[MAXWMPATH+1];
+    char buffer[MAXWMPATH + 1 + 1024];
     char *res_class;
     char *data;
     int cum_len;
diff --git a/cde/programs/dtwm/WmInitWs.c b/cde/programs/dtwm/WmInitWs.c
index 740fb5cc0..3fd1b9412 100644
--- a/cde/programs/dtwm/WmInitWs.c
+++ b/cde/programs/dtwm/WmInitWs.c
@@ -2209,8 +2209,8 @@ void
 InitWmDisplayEnv (void)
 {
     char *pDisplayName;
-    char buffer[256];
     char displayName[256];
+    char buffer[10 + sizeof(displayName)];
 
     pDisplayName = DisplayString (DISPLAY);