diff --git a/games/xinvaders3d/Makefile b/games/xinvaders3d/Makefile
index 564d6c207024..c56763b86b3d 100644
--- a/games/xinvaders3d/Makefile
+++ b/games/xinvaders3d/Makefile
@@ -6,15 +6,16 @@
 #
 
 PORTNAME=	xinvaders3d
-PORTVERSION=	1.31
+PORTVERSION=	1.3.6
 CATEGORIES=	games
-MASTER_SITES= 	http://www.fiu.edu/~dllopi01/
-DISTNAME=	xinv3d.src
+MASTER_SITES= 	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR= ${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 
 MAINTAINER=	jedgar@FreeBSD.org
 
 USE_X_PREFIX=	yes
-WRKSRC=		${WRKDIR}/xinv3d
+WRKSRC=		${WRKDIR}/${PORTNAME}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xinv3d ${PREFIX}/bin
diff --git a/games/xinvaders3d/distinfo b/games/xinvaders3d/distinfo
index f284dc01bfb0..6245623882c8 100644
--- a/games/xinvaders3d/distinfo
+++ b/games/xinvaders3d/distinfo
@@ -1 +1 @@
-MD5 (xinv3d.src.tar.gz) = d254fc9a00346ad4672754a404aa0b93
+MD5 (xinvaders3d-1.3.6.src.tar.gz) = 59fc645f21cf1859b6792131c07caa96
diff --git a/games/xinvaders3d/files/patch-ac b/games/xinvaders3d/files/patch-ac
deleted file mode 100644
index 9a7d6502ed08..000000000000
--- a/games/xinvaders3d/files/patch-ac
+++ /dev/null
@@ -1,11 +0,0 @@
---- vec4x1.c.orig	Thu Jan 20 23:26:05 2000
-+++ vec4x1.c	Fri Jan 21 23:16:28 2000
-@@ -160,7 +160,7 @@
- {
-    float len;
- 
--   len = (float) sqrt ( (a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2]) );
-+   len = (float) sqrt ( (a[0] * a[0]) + (a[1] * a[1]) + (a[2] * a[2]) ) + 0.00001;
- 
-    a[0] /= len;
-    a[1] /= len;
diff --git a/games/xinvaders3d/pkg-descr b/games/xinvaders3d/pkg-descr
index d6b22566bf4b..3db174798efe 100644
--- a/games/xinvaders3d/pkg-descr
+++ b/games/xinvaders3d/pkg-descr
@@ -1,4 +1,4 @@
 XInvaders 3D is a 3D Vector-graphics Space Invaders clone 
 for X.
 
-WWW: http://www.fiu.edu/~dllopi01/xinv3d.htm
+WWW: http://xinvaders3d.sourceforge.net