diff -urN /usr/ports/ftp/yafc/Makefile ftp/yafc/Makefile
--- /usr/ports/ftp/yafc/Makefile	2012-06-25 09:05:19.000000000 +0900
+++ ftp/yafc/Makefile	2012-06-25 16:42:13.000000000 +0900
@@ -7,38 +7,66 @@
 
 PORTNAME=	yafc
 PORTVERSION=	1.2.0
-CATEGORIES=	ftp
+PORTREVISION=	1
+CATEGORIES=	ftp ipv6
 MASTER_SITES=	https://github.com/downloads/sebastinas/yafc/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Yet another ftp client. Similar to ftp(1)
 
+LICENSE=	GPLv2 # (or later)
+
+OPTIONS_DEFINE=	NLS SSH EXAMPLES
+OPTIONS_DEFAULT=NLS SSH
+
 USE_XZ=		yes
+USE_OPENSSL=	yes
+USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+CONFIGURE_ENV=	ac_cv_ipv6=yes
 CONFIGURE_ARGS=	--with-socks=no --with-socks5=no --with-krb4=no \
-		--with-krb5=no --disable-nls
+		--with-krb5=no --with-openssl=${OPENSSLBASE}
+MAKE_JOBS_SAFE=	yes
+
+CPPFLAGS+=	-I${LOCALBASE}/include
+LDFLAGS+=	-L${LOCALBASE}/lib
 
 FETCH_ARGS=	-Fpr
 
 MAN1=		yafc.1
 INFO=		yafc
+PORTEXAMPLES=	inputrc yafcrc
 PLIST_FILES=	bin/yafc \
 		etc/bash_completion.d/yafc
 PLIST_DIRSTRY=	etc/bash_completion.d
 
+.include <bsd.port.options.mk>
+
+.if ${PORT_OPTIONS:MNLS}
+USE_GNOME+=	intltool
+USE_GETTEXT=	yes
+LDFLAGS+=	-lintl
+PLIST_FILES+=	share/locale/sv/LC_MESSAGES/yafc.mo
+.else
+CONFIGURE_ARGS+=	--disable-nls
+.endif
+
+.if ${PORT_OPTIONS:MSSH}
+LIB_DEPENDS+=	ssh:${PORTSDIR}/security/libssh
+.else
+CONFIGURE_ARGS+=	--without-ssh
+.endif
+
 .include <bsd.port.pre.mk>
 
-.if exists(${LOCALBASE}/lib/libreadline.so.6)
-LIB_DEPENDS+=	readline.6:${PORTSDIR}/devel/readline
+.if exists(${LOCALBASE}/lib/libreadline.so)
+LIB_DEPENDS+=	readline:${PORTSDIR}/devel/readline
 .endif
 
 post-install:
 .if ${PORT_OPTIONS:MEXAMPLES}
 	@${MKDIR} ${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/samples/* ${EXAMPLESDIR}
-PLIST_FILES+=	%%EXAMPLESDIR%%/inputrc \
-		%%EXAMPLESDIR%%/yafcrc
-PLIST_DIRS+=	%%EXAMPLESDIR%%
 .endif
 
 .include <bsd.port.post.mk>
diff -urN /usr/ports/ftp/yafc/files/patch-src__Makefile.in ftp/yafc/files/patch-src__Makefile.in
--- /usr/ports/ftp/yafc/files/patch-src__Makefile.in	1970-01-01 09:00:00.000000000 +0900
+++ ftp/yafc/files/patch-src__Makefile.in	2012-06-25 16:35:36.000000000 +0900
@@ -0,0 +1,14 @@
+--- src/Makefile.in.orig	2012-06-05 23:37:06.000000000 +0900
++++ src/Makefile.in	2012-06-25 16:34:16.000000000 +0900
+@@ -308,7 +308,10 @@
+ 						 libmhe/libmhe.a \
+ 						 ../lib/libfoo.a $(SSH_LIBS)
+ 
+-yafc_DEPENDENCIES = $(yafc_LDADD) yafcrc.h
++yafc_DEPENDENCIES = ftp/libftp.a \
++						 libmhe/libmhe.a \
++						 ../lib/libfoo.a yafcrc.h
++
+ AM_CPPFLAGS = -I$(srcdir) \
+ 							-I$(top_srcdir)/lib \
+ 							-I$(top_srcdir)/src/ftp \