diff --git a/astro/nightfall/Makefile b/astro/nightfall/Makefile
index d4aa549d14e9..0b295168773e 100644
--- a/astro/nightfall/Makefile
+++ b/astro/nightfall/Makefile
@@ -1,55 +1,55 @@
 # Created by: Christian Brueffer <chris@unixpages.org>
 
 PORTNAME=	nightfall
 PORTVERSION=	1.92
 PORTREVISION=	1
 CATEGORIES=	astro education
 MASTER_SITES=	http://www.la-samhna.de/nightfall/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Interactive binary star application
 
 LIB_DEPENDS=	libfontconfig.so:x11-fonts/fontconfig \
 		libfreetype.so:print/freetype2
 
 USES=		compiler gettext gmake gnome jpeg pathfix perl5 pkgconfig
 USE_GNOME=	cairo gdkpixbuf2 gtk20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 CONFIGURE_ARGS=	--with-locale-prefix=${PREFIX}/share/locale \
-		--disable-gome
+		--disable-gnome
 
 OPTIONS_DEFINE=		PGPLOT OPENGL
 OPTIONS_DEFAULT=	PGPLOT OPENGL
 OPTIONS_SUB=		yes
 
 OPENGL_CONFIGURE_ON=	--with-lib-GL
 OPENGL_CONFIGURE_OFF=	--disable-opengl
 OPENGL_LIB_DEPENDS=	libgtkgl-2.0.so:x11-toolkits/gtkglarea2
 OPENGL_USES=		gl
 OPENGL_USE=		GL=glut,gl,glu
 
 PGPLOT_DESC=		PGPLOT support
 PGPLOT_CONFIGURE_ON=	--with-pgplot-include=${LOCALBASE}/include \
 			--with-pgplot-lib=${LOCALBASE}/lib
 PGPLOT_CONFIGURE_OFF=	--with-gnuplot
 PGPLOT_LIB_DEPENDS=	libpgplot.so:graphics/pgplot
 PGPLOT_RUN_DEPENDS_OFF=	gnuplot:math/gnuplot
 PGPLOT_USES=		fortran
 
 .include <bsd.port.pre.mk>
 
 post-patch:
 .if ${COMPILER_TYPE} == clang
 	@${REINPLACE_CMD} -e 's|-fforce-addr||' ${WRKSRC}/configure
 .endif
 	@${REINPLACE_CMD} -e 's|CFLAGS -O3|CFLAGS|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|^Icon=gnome|Icon=${DATADIR}/pixmaps|g' \
 		${WRKSRC}/nightfall.desktop
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/nightfall.desktop \
 		${STAGEDIR}${PREFIX}/share/applications
 
 .include <bsd.port.post.mk>
diff --git a/astro/nightfall/pkg-plist b/astro/nightfall/pkg-plist
index 83e149ecba4c..6f06a575d862 100644
--- a/astro/nightfall/pkg-plist
+++ b/astro/nightfall/pkg-plist
@@ -1,96 +1,92 @@
 bin/nightfall
 man/man1/nightfall.1.gz
 share/applications/nightfall.desktop
-%%GNOME%%share/gnome/help/nightfall/C/nightfall.xml
-%%GNOME%%share/gnome/help/nightfall/de/nightfall.xml
 share/locale/de/LC_MESSAGES/nightfall.mo
 share/locale/it/LC_MESSAGES/nightfall.mo
 %%DATADIR%%/cfg/51_peg.cfg
 %%DATADIR%%/cfg/bh_vir.cfg
 %%DATADIR%%/cfg/bh_vir_simple.cfg
 %%DATADIR%%/cfg/dd_mon.cfg
 %%DATADIR%%/cfg/er_vul.cfg
 %%DATADIR%%/cfg/lz_cen.cfg
 %%DATADIR%%/cfg/mr_cyg.cfg
 %%DATADIR%%/cfg/ty_boo.cfg
 %%DATADIR%%/cfg/v541_cyg.cfg
 %%DATADIR%%/data/51_pegR1.dat
 %%DATADIR%%/data/Filter_OM_UVM2.txt
 %%DATADIR%%/data/bh_virB.dat
 %%DATADIR%%/data/bh_virR1.dat
 %%DATADIR%%/data/bh_virR2.dat
 %%DATADIR%%/data/bh_virV.dat
 %%DATADIR%%/data/bh_virb.dat
 %%DATADIR%%/data/bh_viru.dat
 %%DATADIR%%/data/bh_virv.dat
 %%DATADIR%%/data/bh_viry.dat
 %%DATADIR%%/data/dd_monB.dat
 %%DATADIR%%/data/dd_monR2.dat
 %%DATADIR%%/data/dd_monV.dat
 %%DATADIR%%/data/er_vulB.dat
 %%DATADIR%%/data/er_vulI.dat
 %%DATADIR%%/data/er_vulR.dat
 %%DATADIR%%/data/er_vulR1.dat
 %%DATADIR%%/data/er_vulR2.dat
 %%DATADIR%%/data/er_vulU.dat
 %%DATADIR%%/data/er_vulV.dat
 %%DATADIR%%/data/filtertest
 %%DATADIR%%/data/lz_cenR1.dat
 %%DATADIR%%/data/lz_cenR2.dat
 %%DATADIR%%/data/lz_cenb.dat
 %%DATADIR%%/data/lz_cenu.dat
 %%DATADIR%%/data/lz_cenv.dat
 %%DATADIR%%/data/lz_ceny.dat
 %%DATADIR%%/data/mr_cygB.dat
 %%DATADIR%%/data/mr_cygR1.dat
 %%DATADIR%%/data/mr_cygR2.dat
 %%DATADIR%%/data/mr_cygU.dat
 %%DATADIR%%/data/mr_cygV.dat
 %%DATADIR%%/data/ty_booB.dat
 %%DATADIR%%/data/ty_booR1.dat
 %%DATADIR%%/data/ty_booR2.dat
 %%DATADIR%%/data/ty_booV.dat
 %%DATADIR%%/data/v541_cygR1.dat
 %%DATADIR%%/data/v541_cygR2.dat
 %%DATADIR%%/data/v541_cygV.dat
 %%DATADIR%%/doc/C/edu/help0.txt
 %%DATADIR%%/doc/C/edu/help1.txt
 %%DATADIR%%/doc/C/edu/help2.txt
 %%DATADIR%%/doc/C/edu/help3.txt
 %%DATADIR%%/doc/C/edu/help5.txt
 %%DATADIR%%/doc/C/help0.txt
 %%DATADIR%%/doc/C/help1.txt
 %%DATADIR%%/doc/C/help2.txt
 %%DATADIR%%/doc/C/help3.txt
 %%DATADIR%%/doc/C/help4.txt
 %%DATADIR%%/doc/C/help5.txt
 %%DATADIR%%/doc/C/help6.txt
 %%DATADIR%%/doc/C/help7.txt
 %%DATADIR%%/doc/C/help8.txt
 %%DATADIR%%/doc/de/edu/help0.txt
 %%DATADIR%%/doc/de/edu/help1.txt
 %%DATADIR%%/doc/de/edu/help2.txt
 %%DATADIR%%/doc/de/edu/help3.txt
 %%DATADIR%%/doc/de/edu/help5.txt
 %%DATADIR%%/doc/de/help0.txt
 %%DATADIR%%/doc/de/help1.txt
 %%DATADIR%%/doc/de/help2.txt
 %%DATADIR%%/doc/de/help3.txt
 %%DATADIR%%/doc/de/help5.txt
 %%DATADIR%%/pixmaps/checker_256.jpg
 %%DATADIR%%/pixmaps/disk_128.jpg
 %%DATADIR%%/pixmaps/disk_256.jpg
 %%DATADIR%%/pixmaps/gnome-nightfall.png
 %%DATADIR%%/pixmaps/manim.xpm
 %%DATADIR%%/pixmaps/mcomp.xpm
 %%DATADIR%%/pixmaps/mhelp.xpm
 %%DATADIR%%/pixmaps/mplot.xpm
 %%DATADIR%%/pixmaps/nf_logo.xpm
 %%DATADIR%%/pixmaps/star_128.jpg
 %%DATADIR%%/pixmaps/star_256.jpg
 %%DATADIR%%/pixmaps/starp_128.jpg
 %%DATADIR%%/pixmaps/starp_256.jpg
 %%DATADIR%%/pixmaps/stars_128.jpg
 %%DATADIR%%/pixmaps/stars_256.jpg
-%%GNOME%%share/omf/nightfall/nightfall-C.omf
-%%GNOME%%share/omf/nightfall/nightfall-de.omf