diff --git a/misc/screen/patches/patch-attacher_c b/misc/screen/patches/patch-attacher_c
deleted file mode 100644
index a743a00c4be..00000000000
--- a/misc/screen/patches/patch-attacher_c
+++ /dev/null
@@ -1,12 +0,0 @@
-$OpenBSD: patch-attacher_c,v 1.1 2003/10/14 23:05:28 jolan Exp $
---- attacher.c.orig	2003-09-08 09:24:48.000000000 -0500
-+++ attacher.c	2003-10-14 14:10:14.000000000 -0500
-@@ -676,7 +676,7 @@ LockTerminal()
-           setuid(real_uid);	/* this should be done already */
- #endif
-           closeallfiles(0);	/* important: /etc/shadow may be open */
--          execl(prg, "SCREEN-LOCK", NULL);
-+          execl(prg, "SCREEN-LOCK", (void*)NULL);
-           exit(errno);
-         }
-       if (pid == -1)
diff --git a/misc/screen/patches/patch-extern_h b/misc/screen/patches/patch-extern_h
new file mode 100644
index 00000000000..627f2dac35a
--- /dev/null
+++ b/misc/screen/patches/patch-extern_h
@@ -0,0 +1,13 @@
+$OpenBSD: patch-extern_h,v 1.1 2012/03/23 21:37:50 naddy Exp $
+--- extern.h.orig	Fri Mar 23 22:26:34 2012
++++ extern.h	Fri Mar 23 22:27:04 2012
+@@ -146,7 +146,9 @@ extern void  CloseDevice __P((struct win *));
+ #ifdef ZMODEM
+ extern void  zmodem_abort __P((struct win *, struct display *));
+ #endif
++#if 0
+ extern void  execvpe __P((char *, char **, char **));
++#endif
+ 
+ /* utmp.c */
+ #ifdef UTMPOK
diff --git a/misc/screen/patches/patch-fileio_c b/misc/screen/patches/patch-fileio_c
index f1d5f5b0fca..9b252a53fe1 100644
--- a/misc/screen/patches/patch-fileio_c
+++ b/misc/screen/patches/patch-fileio_c
@@ -1,12 +1,12 @@
-$OpenBSD: patch-fileio_c,v 1.1 2003/10/14 23:05:28 jolan Exp $
---- fileio.c.orig	2003-09-08 09:25:28.000000000 -0500
-+++ fileio.c	2003-10-14 14:09:39.000000000 -0500
+$OpenBSD: patch-fileio_c,v 1.2 2012/03/23 21:37:50 naddy Exp $
+--- fileio.c.orig	Mon Sep  8 16:25:28 2003
++++ fileio.c	Fri Mar 23 22:27:59 2012
 @@ -779,7 +779,7 @@ char *cmd;
  #ifdef SIGPIPE
        signal(SIGPIPE, SIG_DFL);
  #endif
 -      execl("/bin/sh", "sh", "-c", cmd, 0);
-+      execl("/bin/sh", "sh", "-c", cmd, (void*)NULL);
++      execl("/bin/sh", "sh", "-c", cmd, NULL);
        Panic(errno, "/bin/sh");
      default:
        break;
diff --git a/misc/screen/patches/patch-window_c b/misc/screen/patches/patch-window_c
new file mode 100644
index 00000000000..03dfff6ac52
--- /dev/null
+++ b/misc/screen/patches/patch-window_c
@@ -0,0 +1,19 @@
+$OpenBSD: patch-window_c,v 1.1 2012/03/23 21:37:50 naddy Exp $
+--- window.c.orig	Fri Mar 23 22:25:23 2012
++++ window.c	Fri Mar 23 22:26:20 2012
+@@ -1387,6 +1387,7 @@ char **args, *ttyn;
+   return pid;
+ }
+ 
++#if 0
+ void
+ execvpe(prog, args, env)
+ char *prog, **args, **env;
+@@ -1432,6 +1433,7 @@ char *prog, **args, **env;
+   if (eaccess)
+     errno = EACCES;
+ }
++#endif
+ 
+ #ifdef PSEUDOS
+