--- Makefile	(revision 411243)
+++ Makefile	(working copy)
@@ -3,6 +3,7 @@ 
 
 PORTNAME=	efl
 PORTVERSION=	1.16.1
+PORTREVISION=	1
 CATEGORIES=	devel enlightenment
 MASTER_SITES=	http://download.enlightenment.org/rel/libs/${PORTNAME}/
 
@@ -34,14 +35,15 @@ 
 
 PLIST_SUB=	BRANCHVERSION=${PORTVERSION:R} PORTVERSION=${PORTVERSION}
 
-OPTIONS_DEFINE=		AVAHI FRIBIDI HARFBUZZ NLS NVIDIA PHYSICS PULSEAUDIO SSL
+OPTIONS_DEFINE=		AVAHI FRIBIDI HARFBUZZ NLS NVIDIA PHYSICS PULSEAUDIO
 OPTIONS_GROUP=		EMOTION INPUT LOADER
 OPTIONS_GROUP_EMOTION=	GSTREAMER LIBXINE V4L
 OPTIONS_GROUP_INPUT=	IBUS SCIM
 OPTIONS_GROUP_LOADER=	OPENJPEG WEBP
-OPTIONS_RADIO=		ENGINE
+OPTIONS_RADIO=		ENGINE SSL
 OPTIONS_RADIO_ENGINE=	OPENGL SDL
-OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PHYSICS SSL GSTREAMER OPENGL
+OPTIONS_DEFAULT=	FRIBIDI HARFBUZZ PHYSICS OPENSSL GSTREAMER OPENGL
+OPTIONS_RADIO_SSL=	OPENSSL GNUTLS NOSSL
 OPTIONS_SUB=		yes
 
 HARFBUZZ_DESC=		OpenType text shaping engine
@@ -106,13 +108,21 @@ 
 PLIST_SUB+=			AUDIO="@comment "
 .endif
 
-.if ${PORT_OPTIONS:MSSL}
+.if ${PORT_OPTIONS:MOPENSSL}
 USE_OPENSSL=			yes
-WITH_OPENSSL_PORT=		yes
-.else
-CONFIGURE_ARGS+=		--with-crypto=none
+CONFIGURE_ARGS+=--with-crypto=openssl
+# Will use port-installed OpenSSL if found at build-time
 .endif
 
+.if ${PORT_OPTIONS:MGNUTLS}
+LIB_DEPENDS+=	libgnutls.so:${PORTSDIR}/security/gnutls
+CONFIGURE_ARGS+=--with-crypto=gnutls
+.endif
+
+.if ${PORT_OPTIONS:MNOSSL}
+CONFIGURE_ARGS+=--with-crypto=none
+.endif
+
 .if ${PORT_OPTIONS:MGSTREAMER} || ${PORT_OPTIONS:MLIBXINE} || ${PORT_OPTIONS:MV4L}
 PLIST_SUB+=			EMOTION=""
 .else
--- files/patch-configure.ac	(revision 411243)
+++ files/patch-configure.ac	(working copy)
@@ -1,5 +1,14 @@ 
---- configure.ac.orig	2015-06-12 05:40:48.754367679 -0700
-+++ configure.ac	2015-06-12 05:45:05.521352761 -0700
+--- configure.ac	2015-12-23 20:12:40.000000000 -0500
++++ configure.ac	2016-03-16 16:52:19.579519000 -0400
+@@ -359,5 +359,7 @@
+
+    openssl)
+-      EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl])
++      EFL_DEPEND_PKG([crypto], [OPENSSL], [openssl],
++          [AC_MSG_RESULT([using port-installed OpenSSL])],
++          [AC_MSG_RESULT([using base OpenSSL])])
+       ;;
+ esac
 @@ -414,12 +414,12 @@
  execinfo.h \
  mcheck.h \
@@ -22,3 +31,12 @@ 
  have_inotify="${ac_cv_header_sys_inotify_h}"
  AM_CONDITIONAL([HAVE_INOTIFY], [test "x${have_inotify}" = "xyes"])
  
+--- m4/efl.m4	2015-07-08 14:33:28.000000000 -0400
++++ m4/efl.m4	2016-03-16 17:03:49.133764000 -0400
+@@ -189,5 +189,5 @@
+ [dnl
+ m4_pushdef([DOWNEFL], m4_translit([$1], [-A-Z], [_a-z]))dnl
+ requirements_pc_[]m4_defn([DOWNEFL])="${requirements_pc_crypto} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
+-requirements_pc_deps_[]m4_defn([DOWNEFL])="${requirements_pc_deps_crypto} ${requirements_pc_deps_[][]m4_defn([DOWNEFL])}"
++requirements_pc_deps_[]m4_defn([DOWNEFL])=`echo ${requirements_pc_deps_crypto} ${requirements_pc_deps_[][]m4_defn([DOWNEFL])} | xargs`
+ requirements_libs_[]m4_defn([DOWNEFL])="${requirements_libs_crypto} ${requirements_libs_[][]m4_defn([DOWNEFL])}"
--- files/patch-gnutls	(nonexistent)
+++ files/patch-gnutls	(working copy)
@@ -0,0 +1,8 @@ 
+--- src/lib/emile/emile_cipher_gnutls.c	2015-12-23 19:24:38.000000000 -0500
++++ src/lib/emile/emile_cipher_gnutls.c	2016-03-16 19:07:15.061448000 -0400
+@@ -385,5 +385,4 @@
+          priority = "NORMAL:%VERIFY_ALLOW_X509_V1_CA_CRT:!VERS-SSL3.0";
+          break;
+-      case EMILE_SSLv3:
+       default:
+          return NULL;