diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index d6c516e4aa6b..4941e26d2c04 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	hylafax
-PORTVERSION=	6.0.3
+PORTVERSION=	6.0.4
 CATEGORIES=	comms
 MASTER_SITES=	ftp://ftp.hylafax.org/source/
 
@@ -38,6 +38,31 @@ PORTDOCS=	RELEASENOTES-4.3.txt RELEASENOTES-4.4.txt RELEASENOTES-6.0.txt
 SUB_FILES=	pkg-message
 USE_RC_SUBR=	hylafax.sh
 
+MAKE_ARGS+=	OPTIMIZER="" -EOPTIMIZER
+HAS_CONFIGURE=	yes
+CONFIGURE_ENV=	ENVOPTS="${CFLAGS}"
+
+MAN1=	edit-faxcover.1 faxalter.1 faxcover.1 faxmail.1 faxrm.1 faxstat.1 \
+	hylafax-client.1 sendfax.1 sendpage.1 sgi2fax.1 textfmt.1
+
+MAN5=	dialrules.5f doneq.5f hosts.hfaxd.5f \
+	hylafax-config.5f hylafax-info.5f hylafax-log.5f hylafax-server.5f \
+	hylafax-shutdown.5f pagermap.5f pagesizes.5f recvq.5f sendq.5f \
+	status.5f tsi.5f typerules.5f xferfaxlog.5f
+
+MAN8=	choptest.8c cqtest.8c dialtest.8c faxabort.8c faxaddmodem.8c \
+	faxadduser.8c faxanswer.8c faxconfig.8c faxcron.8c faxdeluser.8c \
+	faxgetty.8c faxinfo.8c faxlock.8c faxmodem.8c faxq.8c \
+	faxqclean.8c faxquit.8c faxrcvd.8c faxsend.8c faxsetup.8c faxstate.8c \
+	faxwatch.8c hfaxd.8c jobcontrol.8c mkcover.8c notify.8c pagesend.8c pdf2fax.8c \
+	pollrcvd.8c ps2fax.8c recvstats.8c tagtest.8c tiff2fax.8c \
+	tiffcheck.8c tsitest.8c wedged.8c xferfaxstats.8c
+
+SUID_EXES=	${PREFIX}/sbin/faxgetty ${PREFIX}/sbin/faxq \
+		${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
+
+.include <bsd.port.pre.mk>
+
 # Defaults to "North American Letter".  Use "ISO A4" for A4.
 .if defined(PAGESIZE)
 CONFIGURE_ARGS+=--with-PAGESIZE="${PAGESIZE}"
@@ -65,32 +90,6 @@ BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 RUN_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 CONFIGURE_ARGS+=--with-AWK="${LOCALBASE}/bin/gawk"
 .endif
-
-MAKE_ARGS+=	OPTIMIZER="" -EOPTIMIZER
-HAS_CONFIGURE=	yes
-CONFIGURE_ENV=	ENVOPTS="${CFLAGS}"
-
-MAN1=	edit-faxcover.1 faxalter.1 faxcover.1 faxmail.1 faxrm.1 faxstat.1 \
-	hylafax-client.1 sendfax.1 sendpage.1 sgi2fax.1 textfmt.1
-
-MAN5=	dialrules.5f doneq.5f hosts.hfaxd.5f \
-	hylafax-config.5f hylafax-info.5f hylafax-log.5f hylafax-server.5f \
-	hylafax-shutdown.5f pagermap.5f pagesizes.5f recvq.5f sendq.5f \
-	status.5f tsi.5f typerules.5f xferfaxlog.5f
-
-MAN8=	choptest.8c cqtest.8c dialtest.8c faxabort.8c faxaddmodem.8c \
-	faxadduser.8c faxanswer.8c faxconfig.8c faxcron.8c faxdeluser.8c \
-	faxgetty.8c faxinfo.8c faxlock.8c faxmodem.8c faxq.8c \
-	faxqclean.8c faxquit.8c faxrcvd.8c faxsend.8c faxsetup.8c faxstate.8c \
-	faxwatch.8c hfaxd.8c jobcontrol.8c mkcover.8c notify.8c pagesend.8c pdf2fax.8c \
-	pollrcvd.8c ps2fax.8c recvstats.8c tagtest.8c tiff2fax.8c \
-	tiffcheck.8c tsitest.8c wedged.8c xferfaxstats.8c
-
-SUID_EXES=	${PREFIX}/sbin/faxgetty ${PREFIX}/sbin/faxq \
-		${PREFIX}/bin/faxrm ${PREFIX}/bin/faxalter
-
-.include <bsd.port.pre.mk>
-
 .if !defined(WITHOUT_NLS)
 USE_GETTEXT=	yes
 PLIST_SUB+=	WITH_NLS=""
diff --git a/comms/hylafax/distinfo b/comms/hylafax/distinfo
index 2fe9d6607e98..5e3b732f5970 100644
--- a/comms/hylafax/distinfo
+++ b/comms/hylafax/distinfo
@@ -1,3 +1,3 @@
-MD5 (hylafax-6.0.3.tar.gz) = 7ea1452436f54248dd997982277eaa27
-SHA256 (hylafax-6.0.3.tar.gz) = ddfdefbdc41da9d5b36c909a59df73750a61fa7e8940746cf6a277d1318e1f12
-SIZE (hylafax-6.0.3.tar.gz) = 1297582
+MD5 (hylafax-6.0.4.tar.gz) = 6ba4bc3a47c9d2634de1b14f4ab34c80
+SHA256 (hylafax-6.0.4.tar.gz) = 9ea2621f67766bdc694d6bea6aa65f66d8b3bed8afb15711c82b7299709dce9d
+SIZE (hylafax-6.0.4.tar.gz) = 1294867
diff --git a/comms/hylafax/files/patch-configure b/comms/hylafax/files/patch-configure
index f6120b99b825..2a85ea7ed4e1 100644
--- a/comms/hylafax/files/patch-configure
+++ b/comms/hylafax/files/patch-configure
@@ -1,5 +1,5 @@
---- configure.orig	2009-05-15 19:50:52.000000000 +0200
-+++ configure	2009-09-16 09:49:41.000000000 +0200
+--- configure.orig	2009-12-28 20:05:40.000000000 +0100
++++ configure	2009-12-31 10:43:58.000000000 +0100
 @@ -831,6 +831,7 @@
  # NB: use ANSI C prototype to weed out non-ANSI compilers.
  #
@@ -125,15 +125,6 @@
  #include "tiffio.h"
  main()
  {
-@@ -2551,7 +2587,7 @@
- 	if [ ${header_ver} -ge 19960307 ]; then
- 	    case ${lib_ver} in
- 		3.4)		tiff_runlen_t="uint16" ;;
--		3.[5678])	tiff_runlen_t="uint32" ;;
-+		3.[56789])	tiff_runlen_t="uint32" ;;
- 	    esac
- 	fi
-     else
 @@ -3233,7 +3269,7 @@
      strtoul
      writev
diff --git a/comms/hylafax/pkg-plist b/comms/hylafax/pkg-plist
index 224b46865c39..485decda42b7 100644
--- a/comms/hylafax/pkg-plist
+++ b/comms/hylafax/pkg-plist
@@ -57,6 +57,9 @@ sbin/probemodem
 sbin/lockname
 sbin/ondelay
 sbin/hylafax
+%%WITH_NLS%%share/locale/de/LC_MESSAGES/hylafax-client.mo
+%%WITH_NLS%%share/locale/de/LC_MESSAGES/hylafax-server.mo
+%%WITH_NLS%%share/locale/de/LC_MESSAGES/libhylafax.mo
 %%WITH_NLS%%share/locale/es/LC_MESSAGES/hylafax-client.mo
 %%WITH_NLS%%share/locale/es/LC_MESSAGES/hylafax-server.mo
 %%WITH_NLS%%share/locale/es/LC_MESSAGES/libhylafax.mo