diff --git a/games/xinvaders/Makefile b/games/xinvaders/Makefile
index 7549c8e0488..986d15e99c6 100644
--- a/games/xinvaders/Makefile
+++ b/games/xinvaders/Makefile
@@ -1,7 +1,7 @@
 COMMENT=	shoot them nasty little bugs
 
 DISTNAME=	xinvaders-2.1.1
-REVISION=	3
+REVISION=	4
 CATEGORIES=	games
 
 PERMIT_PACKAGE=	Yes
diff --git a/games/xinvaders/patches/patch-main_c b/games/xinvaders/patches/patch-main_c
index 6d82c06e3d3..6d1e69734de 100644
--- a/games/xinvaders/patches/patch-main_c
+++ b/games/xinvaders/patches/patch-main_c
@@ -1,5 +1,6 @@
---- main.c.orig	Mon Sep 11 00:32:16 2000
-+++ main.c	Tue Aug 25 21:10:26 2015
+Index: main.c
+--- main.c.orig
++++ main.c
 @@ -26,7 +26,6 @@ Wed May  8 1991
  #include <X11/IntrinsicP.h>
  #include <X11/Label.h>
@@ -132,7 +133,7 @@
  
    form = XtCreateManagedWidget ("form", formWidgetClass,
  				toplevel, NULL, 0);
-@@ -189,8 +188,8 @@ int main(Cardinal argc, char **argv)
+@@ -189,10 +188,10 @@ int main(Cardinal argc, char **argv)
    XtSetArg (args[n], XtNright, XtChainLeft); n++;
    XtSetArg (args[n], XtNtop, XtChainTop); n++;
    XtSetArg (args[n], XtNbottom, XtChainTop); n++;
@@ -141,8 +142,11 @@
 +  XtSetArg (args[n], XtNwidth, app_data.width); n++;
 +  XtSetArg (args[n], XtNheight, app_data.height); n++;
    
-   gamewidget = (VadersWidget)
+-  gamewidget = (VadersWidget)
++  gamewidget =
      XtCreateManagedWidget("field", vadersWidgetClass, form, args, n);
+   
+   XtSetKeyboardFocus (form, (Widget) gamewidget);
 @@ -204,29 +203,29 @@ int main(Cardinal argc, char **argv)
    XtSetArg (args[n], XtNbottom, XtChainTop); n++;
    XtSetArg (args[n], XtNfromHoriz, gamewidget); n++;
@@ -152,7 +156,8 @@
 +  XtSetArg (args[n], XtNwidth, app_data.scale*IWIDTH); n++;
 +  XtSetArg (args[n], XtNheight, app_data.height/2); n++;
    
-   labelwidget = (VadersWidget)
+-  labelwidget = (VadersWidget)
++  labelwidget =
      XtCreateManagedWidget("label", vadersWidgetClass, form, args, n);
  
    pausebutton = MakeCommandButton(form, "pause", Pause, labelwidget, gamewidget, NULL);
diff --git a/games/xinvaders/patches/patch-vaders_h b/games/xinvaders/patches/patch-vaders_h
index a4982485672..cea7becaec0 100644
--- a/games/xinvaders/patches/patch-vaders_h
+++ b/games/xinvaders/patches/patch-vaders_h
@@ -1,7 +1,7 @@
 Index: vaders.h
 --- vaders.h.orig
 +++ vaders.h
-@@ -90,15 +90,82 @@ typedef struct _VadersRec {
+@@ -90,20 +90,87 @@ typedef struct _VadersRec {
  
  
  
@@ -86,6 +86,12 @@ Index: vaders.h
  ext int level;
  
  ext Display *dpy;
+ ext Window gamewindow, labelwindow;
+-ext VadersWidget gamewidget, labelwidget;
++ext Widget gamewidget, labelwidget;
+ ext int gamewidth, gameheight;
+ ext Widget toplevel;
+ ext int score;
 @@ -111,54 +178,31 @@ ext int basesleft;
  
  /* Base info: */