--- b/interchange/Makefile	
+++ b/interchange/Makefile	
@@ -7,7 +7,7 @@ PORTREVISION=	1
 CATEGORIES=	www perl5
 MASTER_SITES=	http://ftp.icdevgroup.org/interchange/5.6/tar/
 
-MAINTAINER=	loader@freebsdmall.com
+MAINTAINER=	ports@FreeBSD.org
 COMMENT=	RedHat's database-enabled e-commerce server
 
 RUN_DEPENDS=	p5-Safe-Hole>=0.10:${PORTSDIR}/security/p5-Safe-Hole \
@@ -24,7 +24,6 @@ USE_BZIP2=	yes
 OPTIONS_DEFINE=	MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
 
-NO_STAGE=	yes
 .include <bsd.port.options.mk>
 
 USE_RC_SUBR=	interchange
@@ -94,9 +93,9 @@ MAN3=		Vend::Accounting::SQL_Ledger.3 \
 		Vend::UserDB.3
 
 MAKE_ARGS+=	NOCPANINSTALL=1 \
-		INSTALLARCHLIB=${PREFIX}/interchange/ \
-		INSTALLPRIVLIB=${PREFIX}/interchange/lib/ \
-		INSTALLMAN1DIR=${PREFIX}/man/man1
+		INSTALLARCHLIB=${STAGEDIR}${PREFIX}/interchange/ \
+		INSTALLPRIVLIB=${STAGEDIR}{PREFIX}/interchange/lib/ \
+		INSTALLMAN1DIR=${STAGEDIR}{PREFIX}/man/man1
 
 CONFIGURE_ARGS+=	force=1
 
@@ -107,12 +106,13 @@ pre-configure:
 	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} PRE-INSTALL
 
 pre-install:
-	@${MKDIR} ${PREFIX}/interchange
+	@${MKDIR} ${STAGEDIR}${PREFIX}/interchange
+	@${MKDIR} ${STAGEDIR}/var/run/interchange
 
 post-install:
 .for i in compile_link config_prog configdump expire expireall interchange localize makecat offline restart update
-	@${REINPLACE_CMD} -i "" -e "s:${PREFIX}:${PREFIX}/interchange:g; s:${PREFIX}/interchange/bin: ${PREFIX}/bin:g" ${PREFIX}/bin/${i}
+	@${REINPLACE_CMD} -i "" -e "s:${PREFIX}:${PREFIX}/interchange:g; s:${PREFIX}/interchange/bin: ${PREFIX}/bin:g" ${STAGEDIR}${PREFIX}/bin/${i}
 .endfor
-	@PKG_PREFIX=${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
+	@PKG_PREFIX=${STAGEDIR}${PREFIX} ${SH} ${PKGDIR}/pkg-install ${PKGNAME} POST-INSTALL
 
 .include <bsd.port.mk>