diff --git a/net-im/ejabberd/Makefile b/net-im/ejabberd/Makefile
index 7d4823fa5f80..888ec5828561 100644
--- a/net-im/ejabberd/Makefile
+++ b/net-im/ejabberd/Makefile
@@ -1,70 +1,71 @@
 ## New ports collection makefile for:    ejabberd
 # Date created:                         03 July 2004
 # Whom:                                 Alexander Timoshenko <gonzo@univ.kiev.ua>
 #
 # $FreeBSD$
 #
 
 PORTNAME=	ejabberd
 PORTVERSION=	2.1.5
 CATEGORIES=	net-im
 MASTER_SITES=	http://www.process-one.net/downloads/ejabberd/${PORTVERSION}/
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Free and Open Source distributed fault-tolerant Jabber server
 
 BUILD_DEPENDS=	erlc:${PORTSDIR}/lang/erlang
 RUN_DEPENDS=	erl:${PORTSDIR}/lang/erlang
 LIB_DEPENDS=	expat.6:${PORTSDIR}/textproc/expat2
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_ICONV=	yes
 USE_RC_SUBR=	${PORTNAME}
 NOPRECIOUSMAKEVARS=	yes
 
 OPTIONS=	ODBC	"Enable ODBC support"		off
 
 MAKE_ENV=	PORTVERSION=${PORTVERSION}
 CONFIGURE_ARGS+=--localstatedir=/var
 PKGMESSAGE=	${WRKDIR}/pkg-message
 PKGINSTALL=	${WRKDIR}/pkg-install
 PLIST_SUB=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
 SUB_FILES=	pkg-message pkg-install
 SUB_LIST=	PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKDIR}/${PORTNAME}-${PORTVERSION}/COPYING
 
 .include <bsd.port.pre.mk>
 
 USE_OPENSSL=	yes
 
 .if ${OSVERSION} < 700000
 WITH_OPENSSL_PORT=      yes
 CONFIGURE_ARGS+=--with-openssl=${LOCALBASE}
 .endif
 .include "${PORTSDIR}/Mk/bsd.openssl.mk"
 
 .if defined(WITH_ODBC)
 CONFIGURE_ARGS+=--enable-odbc
 PLIST_SUB+=	ODBC=""
 .else
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
-post-patch:
-.ifdef NOPORTDOCS
-	@${REINPLACE_CMD} -e '/DOCDIR)$$/s/^/#/g' ${WRKSRC}/Makefile.in
+.if defined(NOPORTDOCS)
+MAKE_ARGS+=	NOPORTDOCS=${NOPORTDOCS}
 .endif
+
+post-patch:
 	@${REINPLACE_CMD} -e 's,/usr/local,${LOCALBASE},g' ${WRKSRC}/configure
 
 post-install:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGINSTALL} ${PKGNAME} POST-INSTALL
 	${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHMOD} ${SHAREMODE}
 	${FIND} ${PREFIX}/lib/erlang/lib/${DISTNAME} -type f -print0 | ${XARGS} -0 ${CHOWN} ${SHAREOWN}:${SHAREGRP}
 
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>
diff --git a/net-im/ejabberd/files/patch-src-Makefile.in b/net-im/ejabberd/files/patch-src-Makefile.in
index 2fa179d27052..076cde8ea655 100644
--- a/net-im/ejabberd/files/patch-src-Makefile.in
+++ b/net-im/ejabberd/files/patch-src-Makefile.in
@@ -1,53 +1,69 @@
---- Makefile.in.orig	2010-03-12 11:40:41.000000000 +0100
-+++ Makefile.in	2010-04-08 17:23:18.000000000 +0200
-@@ -82,7 +82,7 @@
+--- Makefile.in.orig
++++ Makefile.in
+@@ -89,7 +89,7 @@
  SBINDIR = $(DESTDIR)@sbindir@
  
  # /lib/ejabberd/
 -EJABBERDDIR = $(DESTDIR)@libdir@/ejabberd
 +EJABBERDDIR = @libdir@/erlang/lib/ejabberd-$(PORTVERSION)
  
  # /share/doc/ejabberd
  PACKAGE_TARNAME = @PACKAGE_TARNAME@
-@@ -108,7 +108,7 @@
+@@ -115,7 +115,7 @@
  MSGSDIR = $(PRIVDIR)/msgs
  
  # /var/lib/ejabberd/
 -SPOOLDIR = $(DESTDIR)@localstatedir@/lib/ejabberd
 +SPOOLDIR = $(DESTDIR)@localstatedir@/spool/ejabberd
  
  # /var/lock/ejabberdctl
  CTLLOCKDIR = $(DESTDIR)@localstatedir@/lock/ejabberdctl
-@@ -171,25 +171,22 @@
+@@ -178,25 +178,22 @@
  	#
  	# Configuration files
  	install -d -m 750 $(G_USER) $(ETCDIR)
 -	[ -f $(ETCDIR)/ejabberd.cfg ] \
 -		&& install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg-new \
 -		|| install -b -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)/ejabberd.cfg
 +	install -m 640 $(G_USER) ejabberd.cfg.example $(ETCDIR)
  	sed -e "s*@rootdir@*@prefix@*" \
  		-e "s*@installuser@*@INSTALLUSER@*" \
  		-e "s*@LIBDIR@*@libdir@*" \
  		-e "s*@SYSCONFDIR@*@sysconfdir@*" \
  		-e "s*@LOCALSTATEDIR@*@localstatedir@*" \
  		-e "s*@DOCDIR@*@docdir@*" \
 -		-e "s*@erl@*@ERL@*" ejabberdctl.template \
 -		> ejabberdctl.example
 -	[ -f $(ETCDIR)/ejabberdctl.cfg ] \
 -		&& install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg-new \
 -		|| install -b -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)/ejabberdctl.cfg
 -	install -b -m 644 $(G_USER) inetrc $(ETCDIR)/inetrc
 +		-e "s*@erl@*@ERL@*" \
 +		-e "s*lib/erlang/lib/ejabberd*lib/erlang/lib/ejabberd-$(PORTVERSION)*" \
 +		ejabberdctl.template > ejabberdctl.example
 +	install -m 640 $(G_USER) ejabberdctl.cfg.example $(ETCDIR)
 +	install -m 640 $(G_USER) inetrc $(ETCDIR)/inetrc.example
  	#
  	# Administration script
  	[ -d $(SBINDIR) ] || install -d -m 755 $(SBINDIR)
 -	install -m 550 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
 +	install -m 555 $(G_USER) ejabberdctl.example $(SBINDIR)/ejabberdctl
  	#
  	# Init script
  	sed -e "s*@ctlscriptpath@*$(SBINDIR)*" \
+@@ -253,6 +250,7 @@
+ 	chmod -R 750 $(LOGDIR)
+ 	#
+ 	# Documentation
++ifndef NOPORTDOCS
+ 	install -d $(DOCDIR)
+ 	install -m 644 ../doc/dev.html $(DOCDIR)
+ 	install -m 644 ../doc/guide.html $(DOCDIR)
+@@ -262,6 +260,7 @@
+ 		&& install -m 644 ../doc/guide.pdf $(DOCDIR) \
+ 		|| echo "No ../doc/guide.pdf was built"
+ 	install -m 644 ../COPYING $(DOCDIR)
++endif
+ 
+ uninstall: uninstall-binary
+