diff --git a/curspriv.h b/curspriv.h
index 352e0dc7..36bb7414 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.90 2006/07/16 16:42:31 wmcbrine Exp $ */
+/* $Id: curspriv.h,v 1.91 2006/07/16 18:41:53 wmcbrine Exp $ */
 
 /*                         CURSPRIV.H
 
@@ -142,7 +142,7 @@ int	PDC_query_adapter_type(void);
 
 #ifdef XCURSES
 int	XCursesInstructAndWait(int);
-int	XCursesInitscr(const char *, int, char **);
+int	XCursesInitscr(int, char **);
 #endif
 
 #ifdef PDCDEBUG
diff --git a/pdcurses/initscr.c b/pdcurses/initscr.c
index b1857770..2164a257 100644
--- a/pdcurses/initscr.c
+++ b/pdcurses/initscr.c
@@ -38,7 +38,7 @@
 # undef wnoutrefresh
 #endif
 
-RCSID("$Id: initscr.c,v 1.54 2006/07/16 18:08:16 wmcbrine Exp $");
+RCSID("$Id: initscr.c,v 1.55 2006/07/16 18:41:53 wmcbrine Exp $");
 
 const char *_curses_notice = "PDCurses 3.0 - Public Domain 2006";
 
@@ -173,7 +173,7 @@ WINDOW *Xinitscr(int argc, char *argv[])
 		return NULL;
 
 #ifdef XCURSES
-	if (XCursesInitscr(NULL, argc, argv) == ERR)
+	if (XCursesInitscr(argc, argv) == ERR)
 		exit(7);
 #endif
 
diff --git a/x11/pdcx11.h b/x11/pdcx11.h
index f1675b8d..3c7caf28 100644
--- a/x11/pdcx11.h
+++ b/x11/pdcx11.h
@@ -15,7 +15,7 @@
  * See the file maintain.er for details of the current maintainer.	*
  ************************************************************************/
 
-/* $Id: pdcx11.h,v 1.35 2006/07/16 00:45:15 wmcbrine Exp $ */
+/* $Id: pdcx11.h,v 1.36 2006/07/16 18:41:53 wmcbrine Exp $ */
 
 #define	CURSES_LIBRARY 1
 #ifdef HAVE_CONFIG_H
@@ -302,7 +302,7 @@ int write_socket(int, const char *, int);
 int read_socket(int, char *, int);
 int write_display_socket_int(int);
 
-int XCursesSetupX(const char *display_name, int argc, char *argv[]);
+int XCursesSetupX(int argc, char *argv[]);
 RETSIGTYPE XCursesSigwinchHandler(int signo);
 
 #ifdef _HPUX_SOURCE
diff --git a/x11/process/x11.c b/x11/process/x11.c
index 5e9e0bf0..b72c6567 100644
--- a/x11/process/x11.c
+++ b/x11/process/x11.c
@@ -19,7 +19,7 @@
 
 #include <stdlib.h>
 
-RCSID("$Id: x11.c,v 1.51 2006/07/15 21:03:38 wmcbrine Exp $");
+RCSID("$Id: x11.c,v 1.52 2006/07/16 18:41:53 wmcbrine Exp $");
 
 int visible_cursor = 0;
 int windowEntered = 1;
@@ -424,7 +424,7 @@ void XCursesProcessRequestsFromCurses(XtPointer client_data, int *fid,
 	} 
 } 
 
-int XCursesSetupX(const char *display_name, int argc, char *argv[])
+int XCursesSetupX(int argc, char *argv[])
 {
 	static char *myargv[] = {"PDCurses", NULL};
 	extern bool sb_started;
@@ -472,15 +472,6 @@ int XCursesSetupX(const char *display_name, int argc, char *argv[])
 	XtSetLanguageProc(NULL, (XtLanguageProc)NULL, NULL);
 #endif
 
-	/* If a DISPLAY value has been supplied, set the env variable 
-	   DISPLAY */
-
-	if (display_name)
-	{
-		sprintf(global_display_name, "DISPLAY=%.90s", display_name);
-		putenv(global_display_name);
-	}
-
 	/* Exit if no DISPLAY variable set */
 
 	if (getenv("DISPLAY") == NULL)
diff --git a/x11/process/x11curses.c b/x11/process/x11curses.c
index 9db54f6d..afe04ca1 100644
--- a/x11/process/x11curses.c
+++ b/x11/process/x11curses.c
@@ -22,7 +22,7 @@
 
 #include <stdlib.h>
 
-RCSID("$Id: x11curses.c,v 1.36 2006/07/07 16:20:28 wmcbrine Exp $");
+RCSID("$Id: x11curses.c,v 1.37 2006/07/16 18:41:53 wmcbrine Exp $");
 
 int XCurses_display_cursor(int oldrow, int oldcol, int newrow, int newcol,
 			   int visibility)
@@ -162,7 +162,7 @@ static int XCursesSetupCurses(void)
 	return OK;
 }
 
-int XCursesInitscr(const char *display_name, int argc, char *argv[])
+int XCursesInitscr(int argc, char *argv[])
 {
 	int pid, rc;
 
@@ -216,7 +216,7 @@ int XCursesInitscr(const char *display_name, int argc, char *argv[])
 #else
 		XCursesProcess = 1;
 		otherpid = getppid();
-		rc = XCursesSetupX(display_name, argc, argv);
+		rc = XCursesSetupX(argc, argv);
 #endif
 		break;
 
@@ -225,7 +225,7 @@ int XCursesInitscr(const char *display_name, int argc, char *argv[])
 #ifdef XISPARENT
 		XCursesProcess = 1;
 		otherpid = pid;
-		rc = XCursesSetupX(display_name, argc, argv);
+		rc = XCursesSetupX(argc, argv);
 #else
 		XCursesProcess = 0;
 		rc = XCursesSetupCurses();