diff --git a/mail/femail/Makefile b/mail/femail/Makefile
index 78a1a2fb036..e3e116163a4 100644
--- a/mail/femail/Makefile
+++ b/mail/femail/Makefile
@@ -1,8 +1,12 @@
-# $OpenBSD: Makefile,v 1.3 2007/09/16 00:17:04 merdely Exp $
+# $OpenBSD: Makefile,v 1.4 2007/12/05 20:56:21 okan Exp $
 
-COMMENT=	simple SMTP client
+COMMENT-main=	simple SMTP client
+COMMENT-chroot=	simple SMTP client for chrooted apache
 
-DISTNAME=	femail-0.97
+V=		0.97
+DISTNAME=	femail-${V}
+PKGNAME-main=	femail-${V}p0
+PKGNAME-chroot=	femail-chroot-${V}p0
 CATEGORIES=	mail
 
 HOMEPAGE=	http://bulabula.org/femail/
@@ -20,13 +24,16 @@ EXTRACT_SUFX=	.tgz
 
 NO_REGRESS=	Yes
 
-FLAVORS=	static
-FLAVOR?=
+MULTI_PACKAGES=	-main -chroot
 
-.if ${FLAVOR:L:Mstatic}
-MAKE_ENV=	LDFLAGS="-static"
-.else
-WANTLIB=	c
-.endif
+PREFIX-chroot=	/var/www
+WANTLIB-main=	c
+
+do-install:
+	${INSTALL_PROGRAM} ${WRKSRC}/femail ${PREFIX}/sbin
+	${INSTALL_MAN} ${WRKSRC}/femail.8 ${PREFIX}/man/man8
+	${INSTALL_PROGRAM_DIR} ${WRKINST}${PREFIX-chroot}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/femail-static \
+		${WRKINST}${PREFIX-chroot}/bin/femail
 
 .include <bsd.port.mk>
diff --git a/mail/femail/patches/patch-Makefile b/mail/femail/patches/patch-Makefile
index f54fc487176..411d5a79b66 100644
--- a/mail/femail/patches/patch-Makefile
+++ b/mail/femail/patches/patch-Makefile
@@ -1,8 +1,8 @@
-$OpenBSD: patch-Makefile,v 1.1.1.1 2005/09/22 09:29:14 bernd Exp $
---- Makefile.orig	Mon Sep 19 15:44:23 2005
-+++ Makefile	Tue Sep 20 12:36:13 2005
+$OpenBSD: patch-Makefile,v 1.2 2007/12/05 20:56:21 okan Exp $
+--- Makefile.orig	Tue Sep 20 06:59:04 2005
++++ Makefile	Tue Dec  4 22:10:04 2007
 @@ -1,7 +1,7 @@
- #	$Id: patch-Makefile,v 1.1.1.1 2005/09/22 09:29:14 bernd Exp $
+ #	$Id: patch-Makefile,v 1.2 2007/12/05 20:56:21 okan Exp $
  
 -BINDIR = /usr/local/sbin
 -MANDIR = /usr/local/man
@@ -11,3 +11,11 @@ $OpenBSD: patch-Makefile,v 1.1.1.1 2005/09/22 09:29:14 bernd Exp $
  CFLAGS+= -DHAS_FGETLN -DHAS_STRLCPY
  # CFLAGS+= -Wall -Wstrict-prototypes -Wmissing-prototypes -Wmissing-declarations
  # CFLAGS+= -Wshadow -Wpointer-arith -Wcast-qual -Wsign-compare
+@@ -10,6 +10,7 @@ all:		femail
+ 
+ femail:		femail.o openbsd_compat.o
+ 	$(CC) $(LDFLAGS) femail.o openbsd_compat.o $(LDLIBS) -o femail
++	$(CC) $(LDFLAGS) -static femail.o openbsd_compat.o $(LDLIBS) -o femail-static
+ 
+ femail.o:	femail.c
+ 	$(CC) $(CFLAGS) -c femail.c
diff --git a/mail/femail/pkg/DESCR-chroot b/mail/femail/pkg/DESCR-chroot
new file mode 100644
index 00000000000..9a58abe93c0
--- /dev/null
+++ b/mail/femail/pkg/DESCR-chroot
@@ -0,0 +1,2 @@
+statically linked version of femail which installs itself into the
+default httpd(8) chroot area.
diff --git a/mail/femail/pkg/DESCR b/mail/femail/pkg/DESCR-main
similarity index 100%
rename from mail/femail/pkg/DESCR
rename to mail/femail/pkg/DESCR-main
diff --git a/mail/femail/pkg/PLIST b/mail/femail/pkg/PLIST
deleted file mode 100644
index 248cdeea2d6..00000000000
--- a/mail/femail/pkg/PLIST
+++ /dev/null
@@ -1,3 +0,0 @@
-@comment $OpenBSD: PLIST,v 1.1.1.1 2005/09/22 09:29:14 bernd Exp $
-@man man/man8/femail.8
-sbin/femail
diff --git a/mail/femail/pkg/PLIST-chroot b/mail/femail/pkg/PLIST-chroot
new file mode 100644
index 00000000000..a020d4325a8
--- /dev/null
+++ b/mail/femail/pkg/PLIST-chroot
@@ -0,0 +1,2 @@
+@comment $OpenBSD: PLIST-chroot,v 1.1 2007/12/05 20:56:21 okan Exp $
+bin/femail
diff --git a/mail/femail/pkg/PLIST-main b/mail/femail/pkg/PLIST-main
new file mode 100644
index 00000000000..3e9781bc751
--- /dev/null
+++ b/mail/femail/pkg/PLIST-main
@@ -0,0 +1,5 @@
+@comment $OpenBSD: PLIST-main,v 1.1 2007/12/05 20:56:21 okan Exp $
+@pkgpath mail/femail
+@pkgpath mail/femail,static
+@man man/man8/femail.8
+sbin/femail