diff --git a/mail/mahogany/Makefile b/mail/mahogany/Makefile
index fdad9972b10d..c28472579b28 100644
--- a/mail/mahogany/Makefile
+++ b/mail/mahogany/Makefile
@@ -30,14 +30,8 @@ CONFIGURE_ARGS=		--with-python=none \
 			--with-wx-config=${X11BASE}/bin/wxgtk2-2.4-config
 CONFIGURE_ENV=		OSTYPE=${OPSYS} CFLAGS="${CFLAGS}"
 
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} != "i386" || ${OSVERSION} > 502105
-BROKEN=			"Does not compile on !i386 or FreeBSD >= 5.x"
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-DOPENSSL_NO_KRB5||' -e 's|-O2|${CFLAGS}|' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|$$(DATADIR)/locale|$$(DESTDIR)/share/locale|' ${WRKSRC}/locale/Makefile
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/mail/mahogany/files/patch-c-client-Makefile b/mail/mahogany/files/patch-c-client-Makefile
new file mode 100644
index 000000000000..8efd7196bb62
--- /dev/null
+++ b/mail/mahogany/files/patch-c-client-Makefile
@@ -0,0 +1,11 @@
+--- extra/src/c-client/Makefile.old	Tue Jun  1 19:59:40 2004
++++ extra/src/c-client/Makefile	Tue Jun  1 20:00:37 2004
+@@ -866,7 +866,7 @@
+ 	echo $(CC) > CCTYPE
+ 	echo $(CFLAGS) > CFLAGS
+ 	echo -DCREATEPROTO=$(CREATEPROTO) -DEMPTYPROTO=$(EMPTYPROTO) \
+-	 -DMAILSPOOL=\"$(MAILSPOOL)\" \
++	 -DMD5ENABLE=\"/etc/cram-md5.pwd\" -DMAILSPOOL=\"$(MAILSPOOL)\" \
+ 	 -DANONYMOUSHOME=\"$(MAILSPOOL)/anonymous\" \
+ 	 -DACTIVEFILE=\"$(ACTIVEFILE)\" -DNEWSSPOOL=\"$(NEWSSPOOL)\" \
+ 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS