diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index 05605b20daa7..e2a7567049d0 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -11,7 +11,7 @@
 # does not need Python, so there is no RUN_DEPENDS for Python in
 # this Makefile.
 
-DISTNAME=       fetchmail-5.2.8
+DISTNAME=       fetchmail-5.3.0
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.ccil.org/pub/esr/fetchmail/
 
@@ -27,6 +27,9 @@ MLINKS=		fetchmail.1 fetchmailconf.1
 
 .if ${OSVERSION} >= 400014
 CONFIGURE_ARGS+=--enable-inet6
+.if exists(/usr/lib/libssl.a) && exists(/usr/lib/libcrypto.a)
+CONFIGURE_ARGS+=--with-ssl=/usr
+.endif
 .endif
 
 .if exists(/usr/lib/libkrb.a) && defined(MAKE_KERBEROS4)
diff --git a/mail/fetchmail/distinfo b/mail/fetchmail/distinfo
index 86e55544566c..559ed81b1186 100644
--- a/mail/fetchmail/distinfo
+++ b/mail/fetchmail/distinfo
@@ -1 +1 @@
-MD5 (fetchmail-5.2.8.tar.gz) = 4f4a31bfb31ca66532448c05ee29011c
+MD5 (fetchmail-5.3.0.tar.gz) = a5656aaf9410c1f712bd63fd9e18a5cb
diff --git a/mail/fetchmail/files/patch-ad b/mail/fetchmail/files/patch-ad
index c83e9dff9513..ac4e4498400f 100644
--- a/mail/fetchmail/files/patch-ad
+++ b/mail/fetchmail/files/patch-ad
@@ -1,5 +1,6 @@
---- configure.orig	Sun Jan 16 10:07:09 2000
-+++ configure	Sun Jan 30 21:03:36 2000
+diff -ruN ../fetchmail-5.3.0.OLD/configure ./configure
+--- ../fetchmail-5.3.0.OLD/configure	Wed Feb 16 11:27:00 2000
++++ ./configure	Wed Feb 23 23:42:25 2000
 @@ -1595,7 +1595,7 @@
  if test `uname` = "FreeBSD" 
  then