diff --git a/mail/fetchmail/Makefile b/mail/fetchmail/Makefile
index c63f2d4fb..a85ec05e6 100644
--- a/mail/fetchmail/Makefile
+++ b/mail/fetchmail/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,33 +8,67 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=fetchmail
-PKG_VERSION:=6.3.14
+PKG_VERSION:=6.3.19
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_SOURCE_URL:=http://download.berlios.de/fetchmail
-PKG_MD5SUM:=86d3cfbce151881d8bf76a1efd5bda6a
+PKG_MD5SUM:=64519711c8533f5a34d20c9ff620d880
 
-PKG_INSTALL=1
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_INSTALL:=1
 
 include $(INCLUDE_DIR)/package.mk
 
-define Package/fetchmail
+define Package/fetchmail/Default
   SECTION:=mail
   CATEGORY:=Mail
   TITLE:=Remote mail retriever
   URL:=http://fetchmail.berlios.de/
 endef
 
-define Package/fetchmail/description
+define Package/fetchmail/Default/description
  Retrieves remote mail via POP/IMAP.
  Very useful in conjunction with mutt.
 endef
 
+define Package/fetchmail
+  $(call Package/fetchmail/Default)
+  DEPENDS+= +libopenssl
+  TITLE+= (with SSL support)
+  VARIANT:=ssl
+endef
+
+define Package/fetchmail/description
+ $(call Package/fetchmail/Default/description)
+ This package is built with SSL support.
+endef
+
+define Package/fetchmail-nossl
+  $(call Package/fetchmail/Default)
+  TITLE+= (without SSL support)
+  VARIANT:=nossl
+endef
+
+define Package/fetchmail-nossl/description
+ $(call Package/fetchmail/Default/description)
+ This package is built without SSL support.
+endef
+
 CONFIGURE_ARGS += \
 	--enable-fallback=procmail \
 	--without-hesiod
 
+ifeq ($(BUILD_VARIANT),ssl)
+	CONFIGURE_ARGS += \
+		--with-ssl="$(STAGING_DIR)/usr"
+endif
+
+ifeq ($(BUILD_VARIANT),nossl)
+	CONFIGURE_ARGS += \
+		--without-ssl
+endif
+
 CONFIGURE_VARS += \
 	ac_cv_path_procmail=/usr/sbin/procmail
 
@@ -43,4 +77,7 @@ define Package/fetchmail/install
 	$(CP) $(PKG_INSTALL_DIR)/usr/bin/fetchmail $(1)/usr/bin/
 endef
 
+Package/fetchmail-nossl/install = $(Package/fetchmail/install)
+
 $(eval $(call BuildPackage,fetchmail))
+$(eval $(call BuildPackage,fetchmail-nossl))