Index: head/net-im/xmpp-client/Makefile
===================================================================
--- head/net-im/xmpp-client/Makefile	(revision 398786)
+++ head/net-im/xmpp-client/Makefile	(revision 398787)
@@ -1,29 +1,26 @@
 # $FreeBSD$
 
 PORTNAME=	xmpp-client
-PORTVERSION=	20150208
+PORTVERSION=	20150822
 CATEGORIES=	net-im
 MASTER_SITES=	http://c-s.li/ports/
-DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
-		xmpp-20150105.tar.gz
 
 MAINTAINER=	cs@FreeBSD.org
 COMMENT=	XMPP client with OTR support
 
 LICENSE=	BSD3CLAUSE
 
 BUILD_DEPENDS=	${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.crypto/bcrypt.a:${PORTSDIR}/security/go.crypto \
 		${LOCALBASE}/${GO_LIBDIR}/code.google.com/p/go.net/dict.a:${PORTSDIR}/net/go.net
 
 PLIST_FILES=	bin/xmpp-client
 GO_PKGNAME=	github.com/agl/${PORTNAME}
 
 post-extract:
 	@${MKDIR} ${GO_WRKSRC:H}
 	@${LN} -sf ${WRKSRC} ${GO_WRKSRC}
-	@${LN} -sf ${WRKDIR}/xmpp-20150105 ${GO_WRKDIR_SRC}/github.com/agl/xmpp
 
 
 .include <bsd.port.pre.mk>
 .include "${PORTSDIR}/lang/go/files/bsd.go.mk"
 .include <bsd.port.post.mk>
Index: head/net-im/xmpp-client/distinfo
===================================================================
--- head/net-im/xmpp-client/distinfo	(revision 398786)
+++ head/net-im/xmpp-client/distinfo	(revision 398787)
@@ -1,4 +1,2 @@
-SHA256 (xmpp-client-20150208.tar.gz) = 9a2f079ee5b075d1af073e1dd566d4e2f2844d4383fa84668e94c41c33d9cba7
-SIZE (xmpp-client-20150208.tar.gz) = 23272
-SHA256 (xmpp-20150105.tar.gz) = f7b8867ebd943f859f5c98594874f282d3b6066af741e4a0eeaab7dfb1347f36
-SIZE (xmpp-20150105.tar.gz) = 12825
+SHA256 (xmpp-client-20150822.tar.gz) = 9004459bf1c01fcb9fe20af10ad0f56661a3d297c0a798dbeac7e690c8cfc9fa
+SIZE (xmpp-client-20150822.tar.gz) = 38186
Index: head/net-im/xmpp-client/files/patch-config.go
===================================================================
--- head/net-im/xmpp-client/files/patch-config.go	(revision 398786)
+++ head/net-im/xmpp-client/files/patch-config.go	(revision 398787)
@@ -1,15 +1,15 @@
---- config.go.orig	2015-03-07 22:36:57.219206000 +0100
-+++ config.go	2015-03-07 22:39:28.246637000 +0100
+--- config.go.orig	2015-07-15 22:34:06.825572000 +0200
++++ config.go	2015-07-15 22:36:21.406502000 +0200
 @@ -12,9 +12,9 @@
  	"strings"
  
- 	"github.com/agl/xmpp"
+ 	"github.com/agl/xmpp-client/xmpp"
 -	"golang.org/x/crypto/otr"
 -	"golang.org/x/crypto/ssh/terminal"
 -	"golang.org/x/net/proxy"
 +	"code.google.com/p/go.crypto/otr"
 +	"code.google.com/p/go.crypto/ssh/terminal"
 +	"code.google.com/p/go.net/proxy"
  )
  
  type Config struct {
Index: head/net-im/xmpp-client/files/patch-input.go
===================================================================
--- head/net-im/xmpp-client/files/patch-input.go	(revision 398786)
+++ head/net-im/xmpp-client/files/patch-input.go	(revision 398787)
@@ -1,11 +1,11 @@
---- input.go.orig	2015-03-07 22:39:38.830132000 +0100
-+++ input.go	2015-03-07 22:39:59.824941000 +0100
+--- input.go.orig	2015-07-15 22:36:40.838076000 +0200
++++ input.go	2015-07-15 22:36:50.956305000 +0200
 @@ -7,7 +7,7 @@
  	"strings"
  	"sync"
  
 -	"golang.org/x/crypto/ssh/terminal"
 +	"code.google.com/p/go.crypto/ssh/terminal"
  )
  
  type uiCommand struct {
Index: head/net-im/xmpp-client/files/patch-ui.go
===================================================================
--- head/net-im/xmpp-client/files/patch-ui.go	(revision 398786)
+++ head/net-im/xmpp-client/files/patch-ui.go	(revision 398787)
@@ -1,17 +1,17 @@
---- ui.go.orig	2015-03-07 22:40:10.096733000 +0100
-+++ ui.go	2015-03-07 22:41:07.136470000 +0100
-@@ -22,10 +22,10 @@
+--- ui.go.orig	2015-07-15 22:37:17.187612000 +0200
++++ ui.go	2015-07-15 22:37:59.261081000 +0200
+@@ -23,10 +23,10 @@
  	"time"
  
- 	"github.com/agl/xmpp"
+ 	"github.com/agl/xmpp-client/xmpp"
 -	"golang.org/x/crypto/otr"
 -	"golang.org/x/crypto/ssh/terminal"
 -	"golang.org/x/net/html"
 -	"golang.org/x/net/proxy"
 +	"code.google.com/p/go.crypto/otr"
 +	"code.google.com/p/go.crypto/ssh/terminal"
 +	"code.google.com/p/go.net/html"
 +	"code.google.com/p/go.net/proxy"
  )
  
  var configFile *string = flag.String("config-file", "", "Location of the config file")