diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile
index fe145ef10f46..dfc26b6c9735 100644
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@@ -6,51 +6,57 @@
 #
 
 PORTNAME=	ssvnc
-PORTVERSION=	1.0.20
-PORTREVISION=	7
+PORTVERSION=	1.0.22
 CATEGORIES=	net security
-MASTER_SITES=	http://www.karlrunge.com/x11vnc/etv/
+MASTER_SITES=	SF
+DISTFILES=	${DISTNAME}.src${EXTRACT_SUFX}
 
 MAINTAINER=	alepulver@FreeBSD.org
 COMMENT=	Enhanced TightVNC Viewer (SSVNC: SSL/SSH VNC viewer)
 
 BUILD_DEPENDS=	imake:${PORTSDIR}/devel/imake
 LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg
-RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel
+RUN_DEPENDS=	stunnel:${PORTSDIR}/security/stunnel \
+		xterm:${PORTSDIR}/x11/xterm
 
-USE_XORG=	xi xmu xt xaw
+USE_GMAKE=	yes
+USE_XORG=	xi xmu xt xaw ice xpm xext sm
 USE_TCL_RUN=	84
 USE_TK_RUN=	84
-WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_PERL5_RUN=	yes
+
+MAN1=		ssvnc-gui.1 ssvncviewer.1
+
+OPTIONS=	ULTRAFTP "UltraVNC File Transfer support (Java required)"	off
+
+.include <bsd.port.options.mk>
+
+.if defined(WITH_ULTRAFTP)
+USE_JAVA=	yes
+PLIST_SUB+=	ULTRAFTP=""
+.else
+PLIST_SUB+=	ULTRAFTP="@comment "
+.endif
+.if defined(NOPORTDOCS)
+MAKE_ARGS+=	DOCS=""
+.endif
 
 post-patch:
-	@${REINPLACE_CMD} -e \
-		's|/usr/local|${LOCALBASE}|g; s|/usr/X11R6|${LOCALBASE}|g' \
-		${WRKSRC}/build.unix
-	@${REINPLACE_CMD} -e \
-		's|exec wish|exec ${WISH}|; \
-		 303,$$s|ss_vncviewer|ssvnc-stunnel|; \
-		 s|ssvnc_cmd|ssvnc-stunnel|' \
-		 ${WRKSRC}/bin/util/ssvnc.tcl
-	@${REINPLACE_CMD} -e \
-		's|ss_vncviewer|ssvnc-stunnel|; \
-		 s|-vncviewer|-ssvnc|; \
-		 s|grep Linux|grep ${OPSYS}|' \
-		 ${WRKSRC}/bin/util/ss_vncviewer
-
-do-build:
-	@cd ${WRKSRC} && ${SETENV} UNAME="${OPSYS}" ${SH} build.unix
-
-do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bin/${OPSYS}/vncviewer ${PREFIX}/bin/ssvnc
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/util/ss_vncviewer \
-		${PREFIX}/bin/ssvnc-stunnel
-	${INSTALL_SCRIPT} ${WRKSRC}/bin/util/ssvnc.tcl ${PREFIX}/bin/ssvnc-gui
-.if !defined(NOPORTDOCS)
-	${MKDIR} ${DOCSDIR}
-	cd ${WRKSRC} && ${INSTALL_DATA} README bin/util/stunnel-server.conf \
-		${DOCSDIR}
+	@${REINPLACE_CMD} -e 's|exec wish|exec ${WISH}|' ${WRKSRC}/scripts/util/ssvnc.tcl
+	@${REINPLACE_CMD} -e 's|grep Linux|grep ${OPSYS}|' ${WRKSRC}/scripts/util/ss_vncviewer
+	@${REINPLACE_CMD} -e 's|[[:<:]]ssvnc[[:>:]]|ssvnc-gui|' ${WRKSRC}/man/man1/ssvnc.1
+.if !defined(WITH_ULTRAFTP)
+	@${REINPLACE_CMD} -e "s|sh -c 'type javac'||" \
+		-e "s|sh -c 'type jar'||" \
+		-e 's|cd $$(JSRC);|@#|' \
+		-e 's|cp -p $$(ARCHIVE)|@#|' \
+		${WRKSRC}/Makefile
 .endif
+
+do-configure:
+	@cd ${WRKSRC} && ${GMAKE} config
+
+post-install:
 	@${ECHO_CMD}; ${CAT} ${PKGMESSAGE}; ${ECHO_CMD}
 
 .include <bsd.port.mk>
diff --git a/net/ssvnc/distinfo b/net/ssvnc/distinfo
index ccba4f2e6eec..780c135e8cb4 100644
--- a/net/ssvnc/distinfo
+++ b/net/ssvnc/distinfo
@@ -1,3 +1,3 @@
-MD5 (ssvnc-1.0.20.tar.gz) = 9d4b1531cac07df5a9975d6760b426c1
-SHA256 (ssvnc-1.0.20.tar.gz) = 27edb3bec4cd48a899bec3bcbee437c9ee3514cdd29eb21c3a2b16546780e0f1
-SIZE (ssvnc-1.0.20.tar.gz) = 13191851
+MD5 (ssvnc-1.0.22.src.tar.gz) = 6273ae862a0e1b1b9dd5aa46eab512dc
+SHA256 (ssvnc-1.0.22.src.tar.gz) = a758ad5f4584f2b7aa170fbae5a99849bbc97ef0500b1ecb7445dcbd01d736d9
+SIZE (ssvnc-1.0.22.src.tar.gz) = 453665
diff --git a/net/ssvnc/files/patch-Makefile b/net/ssvnc/files/patch-Makefile
new file mode 100644
index 000000000000..07d476e16761
--- /dev/null
+++ b/net/ssvnc/files/patch-Makefile
@@ -0,0 +1,45 @@
+--- Makefile.orig	2008-11-16 18:31:44.000000000 +0100
++++ Makefile	2009-05-05 16:24:14.572268630 +0200
+@@ -29,6 +29,7 @@
+ MANDIR  ?= $(MAN)
+ APPS    ?= share/applications
+ BINNAME ?= ssvncviewer
++DOCS    ?= share/doc/ssvnc
+ 
+ 
+ VSRC = vnc_unixsrc
+@@ -65,23 +66,28 @@
+ 	cd $(PSRC); $(MAKE) clean
+ 
+ install: all
+-	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB) $(ROOT)$(PREFIX)/$(MANDIR)
++	mkdir -p $(ROOT)$(PREFIX)/$(BIN) $(ROOT)$(PREFIX)/$(LIB)/util $(ROOT)$(PREFIX)/$(MANDIR)
+ 	strip $(VIEWER)
+ 	cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(VNCSPW) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(UNWRAP) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(LIMACC) $(ROOT)$(PREFIX)/$(LIB)
+ 	cp -p $(ULTDSM) $(ROOT)$(PREFIX)/$(LIB)
+-	cp -pR scripts/* $(ROOT)$(PREFIX)/$(LIB)
++	cp -p scripts/ssvnc $(ROOT)$(PREFIX)/$(LIB)
++	cp -p scripts/ssvnc_cmd $(ROOT)$(PREFIX)/$(LIB)
++	cp -p scripts/util/ssvnc.tcl $(ROOT)$(PREFIX)/$(LIB)/util
++	cp -p scripts/util/ss_vncviewer $(ROOT)$(PREFIX)/$(LIB)/util
+ 	cp -p $(ARCHIVE) $(ROOT)$(PREFIX)/$(LIB)/util
+-	cp -p $(MAN)/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)
+-	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc  $(PREFIX)/$(LIB)/ssvnc
+-	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/tsvnc  $(PREFIX)/$(LIB)/tsvnc
+-	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/sshvnc $(PREFIX)/$(LIB)/sshvnc
++	cp -p $(MAN)/ssvnc.1 $(ROOT)$(PREFIX)/$(MANDIR)/ssvnc-gui.1
++	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-gui  $(PREFIX)/$(LIB)/ssvnc
++	./wr_tool $(ROOT)$(PREFIX)/$(BIN)/ssvnc-stunnel  $(PREFIX)/$(LIB)/util/ss_vncviewer
+ 	if [ "X$(APPS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(APPS); fi
+ 	if [ "X$(APPS)" != X ]; then cp -p ssvnc.desktop $(ROOT)$(PREFIX)/$(APPS); fi
+ 	if [ "X$(BINNAME)" != X ]; then cp -p $(VIEWER) $(ROOT)$(PREFIX)/$(BIN)/$(BINNAME); fi
+ 	if [ "X$(BINNAME)" != X ]; then cp -p $(MAN)/ssvncviewer.1 $(ROOT)$(PREFIX)/$(MANDIR)/$(BINNAME).1; fi
++	if [ "X$(DOCS)" != X ]; then mkdir -p $(ROOT)$(PREFIX)/$(DOCS); fi
++	if [ "X$(DOCS)" != X ]; then cp -p scripts/util/stunnel-server.conf $(ROOT)$(PREFIX)/$(DOCS); fi
++	if [ "X$(DOCS)" != X ]; then cp -p README $(ROOT)$(PREFIX)/$(DOCS); fi
+ 
+ 
+ #internal use only, a test install:
diff --git a/net/ssvnc/files/patch-build.unix b/net/ssvnc/files/patch-build.unix
deleted file mode 100644
index de2ec9b9fdda..000000000000
--- a/net/ssvnc/files/patch-build.unix
+++ /dev/null
@@ -1,47 +0,0 @@
---- ./build.unix.orig	Sat Apr 21 20:10:49 2007
-+++ ./build.unix	Mon Apr 23 21:43:58 2007
-@@ -77,12 +77,13 @@
- 
- # Create a tmp dir for this build:
- #
--tmp=./src/tmp/$name.$$
-+tmp=./src/tmp/$name
- if [ "X$TMPDIR" != "X" ]; then
- 	tmp="$TMPDIR/$tmp"
- fi
- mkdir -p $tmp || exit 1
- 
-+if false; then
- # Try to find some static archives of various libraries:
- #
- libs="$tmp/libs"
-@@ -108,6 +109,7 @@
- ls -ld $libs
- ls -l $libs
- echo
-+fi
- 
- have_gcc=""
- if type gcc > /dev/null; then
-@@ -203,7 +205,7 @@
- xmkmf
- make Makefiles
- mv vncviewer/Makefile vncviewer/Makefile.orig
--sed -e "s,EXTRA_LDOPTIONS =,EXTRA_LDOPTIONS = -L$start/$libs $LDFLAGS_OS," \
-+sed -e "s,EXTRA_LDOPTIONS =,EXTRA_LDOPTIONS = $LDFLAGS_OS," \
-     -e "s,CCOPTIONS =,CCOPTIONS = $CPPFLAGS_OS," \
- 	vncviewer/Makefile.orig > vncviewer/Makefile
- 
-@@ -245,6 +247,7 @@
- $LDD $dest/vncviewer$suff
- echo ""
- 
-+if false; then
- # Do stunnel:
- #
- stunnel_src=`ls -td ./src/stunnel* | head -1`
-@@ -322,3 +325,4 @@
- 
- $dest/vncviewer$suff -h
- $LDD $dest/vncviewer$suff
-+fi
diff --git a/net/ssvnc/pkg-message b/net/ssvnc/pkg-message
index b7085d81a531..fd1596af8682 100644
--- a/net/ssvnc/pkg-message
+++ b/net/ssvnc/pkg-message
@@ -2,7 +2,7 @@
 
 SSVNC has been installed, and the following commands are available:
 
-ssvnc		- SSVNC viewer
+ssvncviewer	- SSVNC viewer
 ssvnc-stunnel	- Wrapper script for SSVNC + stunnel (SSH/SSL tunnels)
 ssvnc-gui	- GUI for the previous commands
 
diff --git a/net/ssvnc/pkg-plist b/net/ssvnc/pkg-plist
index 13b43c210e34..f1bce1666fdd 100644
--- a/net/ssvnc/pkg-plist
+++ b/net/ssvnc/pkg-plist
@@ -1,6 +1,20 @@
-bin/ssvnc
 bin/ssvnc-gui
 bin/ssvnc-stunnel
+bin/ssvncviewer
+lib/ssvnc/lim_accept.so
+lib/ssvnc/ssvnc
+lib/ssvnc/ssvnc_cmd
+lib/ssvnc/ultravnc_dsm_helper
+lib/ssvnc/unwrap.so
+lib/ssvnc/util/ss_vncviewer
+lib/ssvnc/util/ssvnc.tcl
+lib/ssvnc/vncstorepw
+lib/ssvnc/vncviewer
+%%ULTRAFTP%%lib/ssvnc/ultraftp.jar
+share/applications/ssvnc.desktop
 %%PORTDOCS%%%%DOCSDIR%%/README
 %%PORTDOCS%%%%DOCSDIR%%/stunnel-server.conf
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
+@dirrmtry lib/ssvnc/util
+@dirrmtry lib/ssvnc
+@dirrmtry share/applications