diff --git a/converters/uudx/Makefile b/converters/uudx/Makefile
index 97f002dfb9db..ccae57a7020e 100644
--- a/converters/uudx/Makefile
+++ b/converters/uudx/Makefile
@@ -12,15 +12,11 @@ COMMENT=	Extractor from uuencoded files
 
 BUILD_DEPENDS=	nkf:japanese/nkf
 
-USES=		lha
+USES=		dos2unix lha
+DOS2UNIX_FILES=	uudx.1 uudx.c
 NO_WRKSUBDIR=	yes
+MAKEFILE=	${FILESDIR}/Makefile
 PLIST_FILES=	bin/uudx \
 		man/ja/man1/uudx.1.gz
 
-pre-patch:
-	@${CP} ${FILESDIR}/Makefile ${WRKSRC}
-
-post-patch:
-	@${REINPLACE_CMD} -e '/sprintf()/d' ${WRKSRC}/uudx.c
-
 .include <bsd.port.mk>
diff --git a/converters/uudx/files/patch-uudx.c b/converters/uudx/files/patch-uudx.c
index a4547027578f..7db4409fa194 100644
--- a/converters/uudx/files/patch-uudx.c
+++ b/converters/uudx/files/patch-uudx.c
@@ -1,23 +1,27 @@
---- uudx.c.orig	Sun Jan 29 16:44:42 1995
-+++ uudx.c	Sat Feb 12 19:31:31 2000
-@@ -89,7 +89,11 @@
- #else
- #define strchr		index
- extern char	*strchr();
+--- uudx.c.orig	2016-04-13 10:36:35 UTC
++++ uudx.c
+@@ -87,10 +87,15 @@ struct utimbuf {
+ #if !BSD
+ #include <string.h>
+ #else
 +#if !defined(__FreeBSD__) && !defined(__OpenBSD__) && !defined(__NetBSD__)
- extern char	*sprintf();
+ #define strchr		index
+ extern char	*strchr();
+ extern char	*sprintf();
+ extern char	*strcpy();
 +#else
-+extern int	sprintf();
++#include <string.h>
++#include <unistd.h>
 +#endif
- extern char	*strcpy();
- #endif /* BSD */
- 
-@@ -346,7 +350,7 @@
- 		norm_dir(work_file_name, p);
- 	}
- 	strcat(work_file_name, "udXXXXXX");
--	if (mktemp(work_file_name) == NULL) {
-+	if (mkstemp(work_file_name) == NULL) {
- 		cant("make", "work_file_name", 1);
- 		/* NOTREACHED */
- 	}
+ #endif /* BSD */
+ 
+ #define	NAMLEN		256
+@@ -346,7 +351,7 @@ main(int argc, char *argv[])
+ 		norm_dir(work_file_name, p);
+ 	}
+ 	strcat(work_file_name, "udXXXXXX");
+-	if (mktemp(work_file_name) == NULL) {
++	if (mkstemp(work_file_name) == NULL) {
+ 		cant("make", "work_file_name", 1);
+ 		/* NOTREACHED */
+ 	}