diff --git a/astro/xmoontool/Makefile b/astro/xmoontool/Makefile
index f429e53cb6e9..dde438c05f0b 100644
--- a/astro/xmoontool/Makefile
+++ b/astro/xmoontool/Makefile
@@ -10,26 +10,25 @@ MASTER_SITES=	http://www.senax.net/xmoontool/
 MAINTAINER=	frank@dynamical-systems.org
 COMMENT=	Version of John Walker's classical moontool for X11/Motif
 
-OPTIONS_DEFINE=	DOCS LIBNOVA MONOCHROME
-OPTIONS_DEFAULT=	LIBNOVA
-LIBNOVA_DESC=	libnova support
-MONOCHROME_DESC=	Use monochrome display
-
 USES=		motif
+USE_XORG=	x11 xt
 
-PORTDOCS=	NOTES
 PLIST_FILES=	bin/xmoontool man/man1/xmoontool.1.gz
+PORTDOCS=	NOTES
 
+OPTIONS_DEFINE=	DOCS LIBNOVA
+OPTIONS_DEFAULT=	LIBNOVA
+
+LIBNOVA_DESC=	High-accuracy astronomical model (libnova)
 LIBNOVA_MAKE_ENV_OFF=	WITHOUT_LIBNOVA=yes
 LIBNOVA_LIB_DEPENDS=	libnova.so:astro/libnova
-MONOCHROME_MAKE_ENV=	DEFINES=""
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xmoontool ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/xmoontool.1 ${STAGEDIR}${PREFIX}/man/man1
+
+do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
-.for i in ${PORTDOCS}
-	${INSTALL_MAN} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
-.endfor
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/astro/xmoontool/files/patch-Makefile b/astro/xmoontool/files/patch-Makefile
index 8b105a88c629..0d011b5eae67 100644
--- a/astro/xmoontool/files/patch-Makefile
+++ b/astro/xmoontool/files/patch-Makefile
@@ -1,8 +1,11 @@
 --- Makefile.orig	2006-02-24 22:00:24 UTC
 +++ Makefile
-@@ -8,9 +8,9 @@ INSTALL?=	install
+@@ -6,11 +6,11 @@
+ RMCMD?=		rm -f
+ INSTALL?=	install
  LOCALBASE?=	/usr/local
- X11BASE?= 	/usr/X11R6
+-X11BASE?= 	/usr/X11R6
++X11BASE?= 	$(LOCALBASE)
  
 -CC= 		gcc
 -CFLAGS= 	-O2 -Wall