diff --git a/net/iaxmodem/Makefile b/net/iaxmodem/Makefile
index decdb97c42ae..8688047d52aa 100644
--- a/net/iaxmodem/Makefile
+++ b/net/iaxmodem/Makefile
@@ -10,38 +10,45 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	stucchi@gufi.org
 COMMENT=	Software modem that connects to IAX channel
 
-LIB_DEPENDS=	tiff.4:${PORTSDIR}/graphics/tiff
+LIB_DEPENDS=	libtiff.so:${PORTSDIR}/graphics/tiff
 
-BROKEN=		Does not build
+USES=		perl5
+USE_PERL5=	patch
+HAS_CONFIGURE=	yes
+USE_RC_SUBR=	${PORTNAME}
+SUB_FILES=	pkg-message
 
-MAN1=		iaxmodem.1
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
-SUB_FILES=	pkg-message
-USE_RC_SUBR=	iaxmodem
-GNU_CONFIGURE=	yes
+PLIST_FILES=	sbin/${PORTNAME}
+PORTDOCS=	CHANGES FAQ README
+PORTEXAMPLES=	config.ttyIAX iaxmodem-cfg.ttyIAX
+MAN1=		${PORTNAME}.1
+
+OPTIONS_DEFINE=	DOCS EXAMPLES
+
+.include <bsd.port.options.mk>
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|/usr/local/etc|${PREFIX}/etc|g" ${WRKSRC}/iaxmodem.1
-	@${REINPLACE_CMD} -e "s|/etc/iaxmodem|${PREFIX}/etc/iaxmodem|g" ${WRKSRC}/iaxmodem.c
+	@${PERL} -0pi.bak -e "s|for ac_header in tgmath\.h.*?done||s" \
+		${WRKSRC}/lib/spandsp/configure
+	@${REINPLACE_CMD} -e "s|/etc/iaxmodem|${PREFIX}&|" \
+		${WRKSRC}/iaxmodem.c
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/iaxmodem ${PREFIX}/sbin/ && \
-	${MKDIR} ${PREFIX}/etc/iaxmodem && \
-	${MKDIR} /var/log/iaxmodem && \
-	${MKDIR} ${EXAMPLESDIR} && \
-	${INSTALL_DATA} ${WRKSRC}/config.ttyIAX ${EXAMPLESDIR}/ && \
-	${INSTALL_DATA} ${WRKSRC}/iaxmodem-cfg.ttyIAX ${EXAMPLESDIR}/
+	${INSTALL_PROGRAM} ${WRKSRC}/iaxmodem ${PREFIX}/sbin
 	${INSTALL_MAN} ${WRKSRC}/iaxmodem.1 ${MAN1PREFIX}/man/man1
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR} && \
-	${INSTALL_DATA} ${WRKSRC}/README ${WRKSRC}/TODO ${WRKSRC}/FAQ ${WRKSRC}/CHANGES ${DOCSDIR}
+.if ${PORT_OPTIONS:MEXAMPLES}
+	@${MKDIR} ${EXAMPLESDIR}
+	${INSTALL_DATA} ${PORTEXAMPLES:S,^,${WRKSRC}/,} ${EXAMPLESDIR}
 .endif
-
-post-install:
-.if !defined(BATCH)
+.if ${PORT_OPTIONS:MDOCS}
+	@${MKDIR} ${DOCSDIR}
+	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/,} ${DOCSDIR}
+.endif
+	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE}
-.endif
+	@${ECHO_MSG}
 
 .include <bsd.port.mk>
diff --git a/net/iaxmodem/files/pkg-message.in b/net/iaxmodem/files/pkg-message.in
index a1bdfb2802d9..3971f5b01803 100644
--- a/net/iaxmodem/files/pkg-message.in
+++ b/net/iaxmodem/files/pkg-message.in
@@ -1,15 +1,13 @@
-To use iaxmodem with Hylafax:
+To use IAXmodem with Hylafax:
 
 - Install and configure Hylafax
 
-- Take a look to %%EXAMPLESDIR%%/config.ttyIAX to configure the "virtual" modem
+- Take a look at %%EXAMPLESDIR%%/config.ttyIAX on how to
+  configure the "virtual" modem
 
-- For accepting incoming FAX/data calls, modify /etc/ttys as below
-	and send SIGHUP to init process:
+- For accepting incoming FAX/data calls, modify /etc/ttys as shown
+  below and send SIGHUP to init process:
 
->ttyIAX  "%%PREFIX%%/sbin/faxgetty"  dialup  on secure
+	ttyIAX	"%%PREFIX%%/sbin/faxgetty"	dialup	on  secure
 
-Additional Documentation:
-%%DOCSDIR%%
-%%EXAMPLESDIR%%
-http://www.voip-info.org/wiki/view/Asterisk+IAXmodem
+Consult documentation for additional information.
diff --git a/net/iaxmodem/pkg-descr b/net/iaxmodem/pkg-descr
index e13c336a5ed0..8406ac92a3c1 100644
--- a/net/iaxmodem/pkg-descr
+++ b/net/iaxmodem/pkg-descr
@@ -1,6 +1,5 @@
-IAXmodem is a software modem written in C that uses
-an IAX channel (commonly provided by an Asterisk PBX
-system) instead of a traditional phone line and uses
-a DSP library instead of DSP hardware chipsets.
+IAXmodem is a software modem written in C that uses an IAX channel (commonly
+provided by an Asterisk PBX system) instead of a traditional phone line and
+uses a DSP library instead of DSP hardware chipsets.
 
-WWW: http://sourceforge.net/projects/iaxmodem
+WWW: http://iaxmodem.sourceforge.net/
diff --git a/net/iaxmodem/pkg-plist b/net/iaxmodem/pkg-plist
deleted file mode 100644
index 01a5ac913311..000000000000
--- a/net/iaxmodem/pkg-plist
+++ /dev/null
@@ -1,10 +0,0 @@
-sbin/iaxmodem
-%%EXAMPLESDIR%%/iaxmodem-cfg.ttyIAX
-%%EXAMPLESDIR%%/config.ttyIAX
-%%PORTDOCS%%%%DOCSDIR%%/README
-%%PORTDOCS%%%%DOCSDIR%%/FAQ
-%%PORTDOCS%%%%DOCSDIR%%/CHANGES
-%%PORTDOCS%%%%DOCSDIR%%/TODO
-@dirrm etc/iaxmodem
-@dirrm %%EXAMPLESDIR%%
-%%PORTDOCS%%@dirrm %%DOCSDIR%%