diff --git a/mail/altermime/Makefile b/mail/altermime/Makefile
index 9bb2da175430..c5b1f4782cf0 100644
--- a/mail/altermime/Makefile
+++ b/mail/altermime/Makefile
@@ -4,7 +4,6 @@
 PORTNAME=	altermime
 PORTVERSION=	0.3.11.a1
 CATEGORIES=	mail textproc
-#MASTER_SITES=	http://www.pldaniels.com/altermime/ \
 MASTER_SITES=	http://T32.tecnik93.com/FreeBSD/ports/altermime/sources/
 
 MAINTAINER=	itetcu@FreeBSD.org
@@ -13,17 +12,13 @@ COMMENT=	Small C program which is used to alter your mime-encoded mailpacks
 PLIST_FILES=	bin/altermime
 PORTDOCS=	CHANGELOG LICENCE README
 
-NO_STAGE=	yes
-post-patch:
-	@${REINPLACE_CMD} -e "s#CFLAGS=-Wall -g#CFLAGS=-Wall ${CFLAGS}#" ${WRKSRC}/Makefile
+OPTIONS_DEFINE=	DOCS
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
-.ifndef(NOPORTDOCS)
-	@${MKDIR} ${DOCSDIR}
+	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
+	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for i in ${PORTDOCS}
-	${INSTALL_DATA} ${WRKSRC}/${i} ${DOCSDIR}
+	${INSTALL_DATA} ${WRKSRC}/${i} ${STAGEDIR}${DOCSDIR}
 .endfor
-.endif
 
 .include <bsd.port.mk>
diff --git a/mail/altermime/files/patch-Makefile b/mail/altermime/files/patch-Makefile
new file mode 100644
index 000000000000..797d9f7cc2bd
--- /dev/null
+++ b/mail/altermime/files/patch-Makefile
@@ -0,0 +1,11 @@
+--- ./Makefile.orig	2014-02-21 09:23:27.770189581 +0100
++++ ./Makefile	2014-02-21 09:24:23.114185601 +0100
+@@ -9,7 +9,7 @@
+ #								opposite of a disclaimer.
+ #ALTERMIME_OPTIONS=-DALTERMIME_PRETEXT
+ ALTERMIME_OPTIONS=
+-CFLAGS=-Wall -Werror -g -I. -O2 $(ALTERMIME_OPTIONS)
++CFLAGS=-I.
+ OBJS= strstack.o mime_alter.o ffget.o pldstr.o filename-filters.o logger.o MIME_headers.o libmime-decoders.o boundary-stack.o qpe.o
+ 
+