Index: mail/claws-mail/Makefile
===================================================================
--- mail/claws-mail/Makefile	(revision 489754)
+++ mail/claws-mail/Makefile	(working copy)
@@ -2,6 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	claws-mail
+PORTREVISION=	1
 CATEGORIES=	mail news ipv6
 
 COMMENT=	Lightweight and featureful GTK+ based e-mail and news client
@@ -21,7 +22,7 @@
 RUN_DEPENDS=	mime-support>0:misc/mime-support
 
 USES=		compiler:c++11-lang cpe desktop-file-utils gnome pathfix \
-		python:2.7 shebangfix ssl
+		python:3.6 shebangfix ssl
 USE_XORG=	ice sm
 USE_GNOME=	cairo gtk20 librsvg2
 SHEBANG_FILES=	tools/*.pl tools/*.py tools/tb2claws-mail
Index: mail/claws-mail/files/patch-configure
===================================================================
--- mail/claws-mail/files/patch-configure	(revision 489754)
+++ mail/claws-mail/files/patch-configure	(working copy)
@@ -1,20 +1,31 @@
---- configure.orig	2016-11-12 20:55:45 UTC
+--- configure.orig	2018-12-22 10:27:42 UTC
 +++ configure
-@@ -21147,7 +21147,7 @@ $as_echo "#define HAVE_LIBSOUP_GNOME 1" 
+@@ -21361,7 +21361,7 @@ $as_echo "yes" >&6; }
+ 	HAVE_ARCHIVE=yes
  fi
  
- 
 -
 +OLDLIBS=$LIBS
  { $as_echo "$as_me:${as_lineno-$LINENO}: checking for archive_read_new in -larchive" >&5
  $as_echo_n "checking for archive_read_new in -larchive... " >&6; }
  if ${ac_cv_lib_archive_archive_read_new+:} false; then :
-@@ -21192,7 +21192,7 @@ else
+@@ -21407,9 +21407,9 @@ else
    HAVE_ARCHIVE=no
  
  fi
--
 +LIBS=$OLDLIBS
  
  
+-
  pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for GDATA" >&5
+ $as_echo_n "checking for GDATA... " >&6; }
+@@ -22336,7 +22336,7 @@ $as_echo "$as_me: WARNING: python-config not found. Ma
+ 		_save_libs="$LIBS"
+ 		if test x"$platform_win32" = xno; then
+ 			# libpython.so
+-			PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}.so"
++			PYTHON_SHARED_LIB="libpython${PYTHON_VERSION}m.so"
+ 			{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+ $as_echo_n "checking for dlopen in -ldl... " >&6; }
+ if ${ac_cv_lib_dl_dlopen+:} false; then :
Index: mail/claws-mail-python/Makefile
===================================================================
--- mail/claws-mail-python/Makefile	(revision 489754)
+++ mail/claws-mail-python/Makefile	(working copy)
@@ -2,12 +2,10 @@
 # $FreeBSD$
 
 PORTNAME=	python
-PORTREVISION=	0
+PORTREVISION=	1
 
 COMMENT=	Python scripting plugin for Claws Mail
 
-BROKEN=		fails to stage
-
 USE_GNOME=	pygtk2
 
 CLAWS_PLUGINS_BUILD=	python