diff --git a/astro/xphoon/Makefile b/astro/xphoon/Makefile
index 3aa0fc2f1195..184cd85bd0b7 100644
--- a/astro/xphoon/Makefile
+++ b/astro/xphoon/Makefile
@@ -6,11 +6,11 @@
 #
 
 PORTNAME=	xphoon
-PORTVERSION=	1991.9.18
-CATEGORIES=	astro x11
-MASTER_SITES=	ftp://ftp.x.org/R5contrib/
-DISTNAME=	xphoon
-EXTRACT_SUFX=	.tar.Z
+PORTVERSION=	2000.06.13
+CATEGORIES=	astro
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
+MASTER_SITE_SUBDIR=	${PORTNAME}
+DISTNAME=	${PORTNAME}-${PORTVERSION:S/.//g}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Set the root window to the moon in its current phase
diff --git a/astro/xphoon/distinfo b/astro/xphoon/distinfo
index f875bb9f4ecc..bfbe2de9e478 100644
--- a/astro/xphoon/distinfo
+++ b/astro/xphoon/distinfo
@@ -1 +1 @@
-MD5 (xphoon.tar.Z) = 9d8cce7199cd445692929e1e80f7058e
+MD5 (xphoon-20000613.tar.gz) = 2408072c3da5310de51a2f5dd0427424
diff --git a/astro/xphoon/files/patch-ab b/astro/xphoon/files/patch-ab
index 2745701a8932..e09711110328 100644
--- a/astro/xphoon/files/patch-ab
+++ b/astro/xphoon/files/patch-ab
@@ -1,24 +1,13 @@
 --- xphoon.c.orig	Thu Sep 19 04:57:37 1991
 +++ xphoon.c	Sun Jan  3 18:30:29 1999
-@@ -31,9 +31,18 @@
- 
- /* Externals. */
- 
-+#if (defined(__unix__) || defined(unix)) && !defined(USG)
-+#include <sys/param.h>
-+#endif
-+
-+#if (defined(BSD) && (BSD >= 199306))
-+#include <stdlib.h>
-+#include <time.h>
-+#else
- extern char* malloc();
- extern long time();
- extern long random();
-+#endif
- 
- extern void getbits();
- extern double jtime();
+@@ -20,7 +20,6 @@
+ #include "vroot.h"
+ #include <stdio.h>
+ #include <stdlib.h>	/* added by David Frey */
+-#include <malloc.h>	/* added by David Frey */
+ #include <time.h>	/* added by David Frey */
+ #include <math.h>
+ #include <limits.h>	/* added by Lalo Martins */
 @@ -65,7 +74,7 @@
      int blackflag, demoflag;
      int printpid;
diff --git a/astro/xphoon/pkg-descr b/astro/xphoon/pkg-descr
index 9515dd0f77f8..bee902fe5090 100644
--- a/astro/xphoon/pkg-descr
+++ b/astro/xphoon/pkg-descr
@@ -1 +1,3 @@
 Xphoon sets X the root window to a picture of the moon in its current phase.
+
+WWW: http://xphoon.sourceforge.net/