Index: devel/librelp/Makefile
===================================================================
--- devel/librelp/Makefile	(revision 478129)
+++ devel/librelp/Makefile	(working copy)
@@ -3,6 +3,7 @@
 
 PORTNAME=	librelp
 PORTVERSION=	1.2.17
+PORTREVISION=	1
 CATEGORIES=	devel
 MASTER_SITES=	http://download.rsyslog.com/librelp/
 
@@ -20,7 +21,7 @@
 
 OPENSSL_USES=			ssl
 OPENSSL_CONFIGURE_ENABLE=	tls-openssl
-OPENSSL_CONFIGURE_ENV=		OPENSSL_LIBS=${OPENSSLLIB} \
+OPENSSL_CONFIGURE_ENV=		OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
 				OPENSSL_CFLAGS="-I ${OPENSSLINC}"
 
 USES=		libtool pathfix pkgconfig
Index: sysutils/rsyslog8/Makefile
===================================================================
--- sysutils/rsyslog8/Makefile	(revision 478129)
+++ sysutils/rsyslog8/Makefile	(working copy)
@@ -2,6 +2,7 @@
 
 PORTNAME=	rsyslog
 PORTVERSION=	8.37.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 MASTER_SITES=	http://www.rsyslog.com/files/download/rsyslog/
 
@@ -27,8 +28,10 @@
 
 CONFLICTS_BUILD=	libinotify-*
 
-OPTIONS_DEFINE=	DBI DOCS ELASTIC GCRYPT GNUTLS GSSAPI JSONPARSE  MYSQL PGSQL \
+OPTIONS_DEFINE=	DBI DOCS ELASTIC GCRYPT GSSAPI JSONPARSE  MYSQL PGSQL \
 		RELP SNMP NORMALIZE
+OPTIONS_RADIO=	SSLLIB
+OPTIONS_RADIO_SSLLIB=	GNUTLS OPENSSL
 OPTIONS_DEFAULT=GCRYPT
 OPTIONS_SUB=	yes
 
@@ -46,6 +49,7 @@
 GCRYPT_LIB_DEPENDS=	libgcrypt.so:security/libgcrypt \
 			libgpg-error.so:security/libgpg-error
 GCRYPT_BUILD_DEPENDS=	libgcrypt-config:security/libgcrypt
+GCRYPT_PLIST_FILES=	lib/rsyslog/lmcry_gcry.so
 
 GNUTLS_DESC=		GNUTLS module for rsyslog
 GNUTLS_LIB_DEPENDS=	libgnutls.so:security/gnutls
@@ -69,6 +73,13 @@
 MYSQL_PLIST_FILES=	lib/rsyslog/ommysql.so
 MYSQL_PORTDOCS=		plugins/ommysql/createDB.sql
 
+OPENSSL_USES=		ssl
+OPENSSL_CONFIGURE_ENABLE=	openssl
+OPENSSL_CONFIGURE_ENV=	OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto" \
+			OPENSSL_CFLAGS="-I ${OPENSSLINC}"
+OPENSSL_PLIST_FILES=	lib/rsyslog/lmnsd_ossl.so
+
+
 PGSQL_DESC=		PostgreSQL output module for rsyslog
 PGSQL_USES=		pgsql
 PGSQL_CONFIGURE_ENABLE=	pgsql
Index: sysutils/rsyslog8/pkg-plist
===================================================================
--- sysutils/rsyslog8/pkg-plist	(revision 478129)
+++ sysutils/rsyslog8/pkg-plist	(working copy)
@@ -9,7 +9,6 @@
 lib/rsyslog/imtcp.so
 lib/rsyslog/imudp.so
 lib/rsyslog/imuxsock.so
-%%GCRYPT%%lib/rsyslog/lmcry_gcry.so
 lib/rsyslog/lmnet.so
 lib/rsyslog/lmnetstrms.so
 lib/rsyslog/lmnsd_ptcp.so