diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 5aa71287c1c6..a841ca9e8422 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,50 +1,41 @@
 PORTNAME=	aspell
 PORTVERSION=	0.60.8.1
 PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GNU/aspell
 
 MAINTAINER=	office@FreeBSD.org
 COMMENT=	Spelling checker with better suggestion logic than ispell
 WWW=		http://aspell.net/
 
 LICENSE=	LGPL21
 
 USES=		cpe gmake iconv libtool ncurses perl5 shebangfix
-
-OPTIONS_DEFINE=	NLS DOCS
-OPTIONS_SUB=	yes
-
 GNU_CONFIGURE=	yes
 GNU_CONFIGURE_MANPREFIX=${PREFIX}/share
 CONFIGURE_ARGS=	--enable-dict-dir=${DATADIR}	\
 		--enable-docdir=${DOCSDIR}	\
 		--enable-curses="${NCURSESLIBS}" \
 		--enable-static
-
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	scripts/aspell-import
 CPE_VENDOR=	gnu
 
 INSTALL_TARGET=	install-strip
 VERINST=	${PORTVERSION:R:R}
 SUB_FILES=	aspell.ver
 PLIST_SUB=	VER=${VERINST}
 SUB_LIST=	VERINST=${VERINST}
-INFO=	aspell-dev aspell
+INFO=		aspell aspell-dev
+
+OPTIONS_DEFINE=	NLS
+OPTIONS_SUB=	yes
 
 NLS_USES=		gettext
 NLS_CONFIGURE_ENABLE=	nls
 
-.include <bsd.port.options.mk>
-
-# Does not link without at least -O
-.if !defined(CFLAGS) || ${CFLAGS:M-O*} == ""
-CFLAGS+=		-O
-.endif
-
 post-install:
 	${INSTALL_DATA} ${WRKDIR}/aspell.ver ${STAGEDIR}${PREFIX}/etc
 
 .include <bsd.port.mk>