diff -ruN freetalk.bak/Makefile freetalk/Makefile
--- freetalk.bak/Makefile	2016-10-19 23:52:01.129753000 +0300
+++ freetalk/Makefile	2016-10-25 20:19:28.092350000 +0300
@@ -1,28 +1,32 @@
 # Created by: Oleg Ginzburg  (olevole@olevole.ru)
-# $FreeBSD: head/net-im/freetalk/Makefile 412348 2016-04-01 14:16:16Z mat $
+# $FreeBSD: head/net-im/freetalk/Makefile 366777 2014-08-31 15:17:49Z tijl $
 
 PORTNAME=	freetalk
-PORTVERSION=	3.2
-PORTREVISION=	5
+PORTVERSION=	4.1
 CATEGORIES=	net-im
-MASTER_SITES=	SAVANNAH/freetalk \
-		http://itdev.spb.ru/mirror/
 
 MAINTAINER=	olevole@olevole.ru
 COMMENT=	GNU console based Jabber client
 
 OPTIONS_DEFINE=	NLS
 
-LIB_DEPENDS=	libloudmouth-1.so:net-im/loudmouth
-BUILD_DEPENDS=	guile>=1.8.6:lang/guile
-RUN_DEPENDS=	guile>=1.8.6:lang/guile
+LIB_DEPENDS=	libloudmouth-1.so:${PORTSDIR}/net-im/loudmouth \
+		libcurl.so:${PORTSDIR}/ftp/curl \
+		libguile-2.0.so:lang/guile2
+
+BUILD_DEPENDS=	guile:${PORTSDIR}/lang/guile2
+RUN_DEPENDS=	guile:${PORTSDIR}/lang/guile2 \
+		curl:${PORTSDIR}/ftp/curl
+USE_GITHUB=	yes
+GH_ACCOUNT=	GNUFreetalk
+GH_TAGNAME=	v${PORTVERSION}
+GH_COMMIT=	6ce50aa
 
 USES=		pkgconfig
 USE_GNOME=	glib20
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
-LDFLAGS+=	-lpthread -L${LOCALBASE}/lib
-INFO=		freetalk
+LDFLAGS+=	-L${LOCALBASE}/lib ${PTHREAD_LIBS}
 
 OPTIONS_SUB=	yes
 
@@ -30,4 +34,7 @@
 NLS_CONFIGURE_WITH=libintl-prefix=${LOCALBASE}
 NLS_CONFIGURE_OFF= --disable-nls
 
+pre-configure:
+	cd ${WRKSRC} && /bin/sh ./autogen.sh
+
 .include <bsd.port.mk>
diff -ruN freetalk.bak/distinfo freetalk/distinfo
--- freetalk.bak/distinfo	2016-10-19 23:52:01.130652000 +0300
+++ freetalk/distinfo	2016-10-25 19:02:13.585343000 +0300
@@ -1,2 +1,3 @@
-SHA256 (freetalk-3.2.tar.gz) = ba4a70052d94293a3c073828ca1993bde97d3f3f47554b65ceba9799a43fb689
-SIZE (freetalk-3.2.tar.gz) = 360291
+TIMESTAMP = 1477411333
+SHA256 (GNUFreetalk-freetalk-4.1-v4.1_GH0.tar.gz) = de72e75eda141047336fa76831188738290440df994ee58da8fbac15d4b1b9e6
+SIZE (GNUFreetalk-freetalk-4.1-v4.1_GH0.tar.gz) = 134009
diff -ruN freetalk.bak/pkg-plist freetalk/pkg-plist
--- freetalk.bak/pkg-plist	2016-10-19 23:52:01.130060000 +0300
+++ freetalk/pkg-plist	2016-10-25 20:25:34.589375000 +0300
@@ -1,29 +1,29 @@
 bin/freetalk
-%%DOCSDIR%%/examples/daemon.ft
-%%DOCSDIR%%/examples/freetalk.scm
-%%DOCSDIR%%/examples/hello-world.ft
-%%DOCSDIR%%/examples/mimic.ft
-%%DATADIR%%/extensions/beep.scm
-%%DATADIR%%/extensions/broadcast.scm
-%%DATADIR%%/extensions/color.scm
-%%DATADIR%%/extensions/connection.scm
-%%DATADIR%%/extensions/dict-buddy.scm
-%%DATADIR%%/extensions/dyn-commands.scm
-%%DATADIR%%/extensions/file-transfer.scm
 %%DATADIR%%/extensions/first-time-run.sh
-%%DATADIR%%/extensions/hacker-romance.scm
-%%DATADIR%%/extensions/history.scm
-%%DATADIR%%/extensions/init.scm
 %%DATADIR%%/extensions/login.scm
-%%DATADIR%%/extensions/loudscream.scm
+%%DATADIR%%/extensions/state.scm
+%%DATADIR%%/extensions/roster.scm
+%%DATADIR%%/extensions/connection.scm
 %%DATADIR%%/extensions/mr-oxford.scm
+%%DATADIR%%/extensions/dict-buddy.scm
 %%DATADIR%%/extensions/pipe.scm
 %%DATADIR%%/extensions/proud-of-freetalk.scm
-%%DATADIR%%/extensions/roster.scm
+%%DATADIR%%/extensions/color.scm
+%%DATADIR%%/extensions/beep.scm
+%%DATADIR%%/extensions/smart-prompt.scm
 %%DATADIR%%/extensions/shell.scm
-%%DATADIR%%/extensions/state.scm
-%%DATADIR%%/extensions/url.scm
+%%DATADIR%%/extensions/loudscream.scm
+%%DATADIR%%/extensions/broadcast.scm
+%%DATADIR%%/extensions/dyn-commands.scm
+%%DATADIR%%/extensions/hacker-romance.scm
 %%DATADIR%%/extensions/utils.scm
-%%NLS%%share/locale/en@boldquot/LC_MESSAGES/freetalk.mo
-%%NLS%%share/locale/en@quot/LC_MESSAGES/freetalk.mo
+%%DATADIR%%/extensions/init.scm
+%%DATADIR%%/extensions/history.scm
+%%DATADIR%%/extensions/url.scm
+%%DOCSDIR%%/examples/freetalk.scm
+%%DOCSDIR%%/examples/daemon.ft
+%%DOCSDIR%%/examples/hello-world.ft
+%%DOCSDIR%%/examples/mimic.ft
+info/freetalk.info
+info/dir
 man/man1/freetalk.1.gz