diff --git a/curspriv.h b/curspriv.h
index 5149bbf2..25adff96 100644
--- a/curspriv.h
+++ b/curspriv.h
@@ -15,7 +15,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: curspriv.h,v 1.41 2006/02/27 07:48:45 wmcbrine Exp $ */
+/* $Id: curspriv.h,v 1.42 2006/02/27 07:58:30 wmcbrine Exp $ */
 
 /*                         CURSPRIV.H
 
@@ -285,7 +285,7 @@ int	XCurses_get_input_fd(void);
 int	XCursesInstruct(int);
 int	XCursesInstructAndWait(int);
 int	XCurses_transform_line(const chtype *, int, int, int);
-int	XCursesInitscr(char *, int, char **);
+int	XCursesInitscr(const char *, int, char **);
 int	XCursesEndwin(void);
 void	XCursesCleanupCursesProcess(int);
 int	XCursesResizeScreen(int, int);
diff --git a/x11/process/x11.c b/x11/process/x11.c
index 7e85346b..4ef68342 100644
--- a/x11/process/x11.c
+++ b/x11/process/x11.c
@@ -9,7 +9,7 @@
 
 #ifdef PDCDEBUG
 const char rcsid_x11 =
-	"$Id: x11.c,v 1.40 2006/02/25 21:34:45 wmcbrine Exp $";
+	"$Id: x11.c,v 1.41 2006/02/27 07:58:31 wmcbrine Exp $";
 #endif
 
 extern AppData app_data;
@@ -455,7 +455,7 @@ void XCursesProcessRequestsFromCurses(XtPointer client_data, int *fid,
 	} 
 } 
 
-int XCursesSetupX(char *display_name, int argc, char *argv[])
+int XCursesSetupX(const char *display_name, int argc, char *argv[])
 {
 	static char *myargv[] = {"XCurses", NULL};
 	extern bool sb_started;
@@ -509,8 +509,7 @@ int XCursesSetupX(char *display_name, int argc, char *argv[])
 
 	if (display_name)
 	{
-		strcpy(global_display_name, "DISPLAY=");
-		strcat(global_display_name, display_name);
+		sprintf(global_display_name, "DISPLAY=%.90s", display_name);
 		putenv(global_display_name);
 	}
 
diff --git a/x11/process/x11.h b/x11/process/x11.h
index 95e28c9f..3501a2d7 100644
--- a/x11/process/x11.h
+++ b/x11/process/x11.h
@@ -33,7 +33,7 @@ void SelectionSet(void);
 int write_socket(int, char *, int);
 int read_socket(int, char *, int);
 
-int XCursesSetupX(char *display_name, int argc, char *argv[]);
+int XCursesSetupX(const char *display_name, int argc, char *argv[]);
 RETSIGTYPE XCursesSigwinchHandler(int signo);
 
 #ifdef _HPUX_SOURCE
diff --git a/x11/process/x11curses.c b/x11/process/x11curses.c
index ff670b4b..918d1a51 100644
--- a/x11/process/x11curses.c
+++ b/x11/process/x11curses.c
@@ -12,7 +12,7 @@
 
 #ifdef PDCDEBUG
 const char rcsid_x11curses =
-        "$Id: x11curses.c,v 1.25 2006/02/27 07:48:45 wmcbrine Exp $";
+        "$Id: x11curses.c,v 1.26 2006/02/27 07:58:31 wmcbrine Exp $";
 #endif
 
 extern AppData app_data;
@@ -360,7 +360,7 @@ static int XCursesSetupCurses(void)
 	return OK;
 }
 
-int XCursesInitscr(char *display_name, int argc, char *argv[])
+int XCursesInitscr(const char *display_name, int argc, char *argv[])
 {
 	int pid, rc;