diff --git a/x11/xforward/files/patch-Makefile b/x11/xforward/files/patch-Makefile
index dc95863077498..c2e78478a5ea0 100644
--- a/x11/xforward/files/patch-Makefile
+++ b/x11/xforward/files/patch-Makefile
@@ -1,5 +1,5 @@
 --- Makefile.orig	1993-06-04 19:32:01.000000000 -0700
-+++ Makefile	2023-02-11 06:30:12.418352000 -0800
++++ Makefile	2023-02-14 20:39:04.842100000 -0800
 @@ -18,18 +18,19 @@
  # MANDIR is where the manual page will be installed.
  
@@ -25,13 +25,7 @@
  CFLAGS= ${INCFLAGS} -O
  
  # For CenterLine CodeCenter
-@@ -46,11 +47,12 @@
- 	cc ${LDFLAGS} xforward.o -o xforward ${LIBS}
- 
- xforward.o:	xforward.c
--	cc -c ${CFLAGS} xforward.c
-+	cc -c -Wno-int-conversion ${CFLAGS} xforward.c
- 
+@@ -51,6 +52,7 @@
  install: ${PROGS}
  	install -c xforward ${DESTDIR}${BINDIR}/xforward
  	install -c xforward.1 ${DESTDIR}${MANDIR}/xforward.1
diff --git a/x11/xforward/files/patch-xforward.c b/x11/xforward/files/patch-xforward.c
index c6f5b916b379e..db26949227559 100644
--- a/x11/xforward/files/patch-xforward.c
+++ b/x11/xforward/files/patch-xforward.c
@@ -1,5 +1,5 @@
 --- xforward.c.orig	1993-06-04 19:30:16.000000000 -0700
-+++ xforward.c	2012-04-27 13:20:20.603550383 -0700
++++ xforward.c	2023-02-14 20:42:29.724713000 -0800
 @@ -292,7 +292,7 @@
  	struct timeval timeout;
  	struct pend_conn *cur,*prev;
@@ -9,3 +9,12 @@
  	int exitstat,wopts,newoutgoing;
  
  	/* for each entry, call waitpid */
+@@ -525,7 +525,7 @@
+ 			app_con = XtCreateApplicationContext();
+ 			dpy = XtOpenDisplay(app_con,disp_str,NULL,"Xforward",
+ 					    NULL,0,&argc,argv);
+-			topshell = XtAppCreateShell(NULL,"Xforward",applicationShellWidgetClass, dpy, NULL,NULL);
++			topshell = XtAppCreateShell(NULL,"Xforward",applicationShellWidgetClass, dpy, NULL, (Cardinal)NULL);
+ 			sprintf(dialog_message,"Allow X connection from %s ?",
+ 				okhost_names[i]);
+ 			msg_str = XmStringCreateSimple(dialog_message);