diff --git a/mail/mailsend/Makefile b/mail/mailsend/Makefile
index 5b63bae8c..f9480f152 100644
--- a/mail/mailsend/Makefile
+++ b/mail/mailsend/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2014 OpenWrt.org
+# Copyright (C) 2014-2015 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=mailsend
 PKG_VERSION:=1.17b15
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=https://github.com/muquit/mailsend/archive/$(PKG_VERSION)
@@ -20,32 +20,42 @@ PKG_MAINTAINER:=Ted Hess <thess@kitschensync.net>
 PKG_LICENSE:=BSD-3-Clause
 PKG_LICENSE_FILES:=COPYRIGHT
 
+PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)-$(BUILD_VARIANT)/$(PKG_NAME)-$(PKG_VERSION)
+
 include $(INCLUDE_DIR)/package.mk
 
-define Package/mailsend
+define Package/mailsend/default
 	SECTION:=mail
 	CATEGORY:=Mail
 	TITLE:=A command-line mail sender
-	DEPENDS:=+MAILSEND_SSL:libopenssl
 	URL:=https://github.com/muquit/mailsend
 endef
 
-define Package/mailsend/config
-config MAILSEND_SSL
-        bool "SSL support"
-        depends on PACKAGE_mailsend
-        default n
-        help
-          Implements SSL support in mailsend (using libopenssl).
+define Package/mailsend-nossl
+	$(call Package/mailsend/default)
+	TITLE+= (without SSL)
+	VARIANT:=nossl
+endef
+
+define Package/mailsend
+	$(call Package/mailsend/default)
+	TITLE+= (with SSL)
+	DEPENDS:=+libopenssl
+	VARIANT:=ssl
 endef
 
-ifeq ($(CONFIG_MAILSEND_SSL),y)
+ifeq ($(BUILD_VARIANT),ssl)
   CONFIGURE_ARGS+= --with-openssl=$(STAGING_DIR)/usr
 endif
 
 define Package/mailsend/description
+  $(call Package/mailsend-nossl/description)
+  .
+  SSL supported is provided by OpenSSL.
+endef
+
+define Package/mailsend-nossl/description
   Mailsend is a simple command line program to send mail via SMTP protocol.
-  SSL is supported via OpenSSL (optional).
 endef
 
 define Build/Compile
@@ -57,4 +67,7 @@ define Package/mailsend/install
 	$(INSTALL_BIN) $(PKG_BUILD_DIR)/mailsend $(1)/usr/bin/
 endef
 
+Package/mailsend-nossl/install=$(Package/mailsend/install)
+
 $(eval $(call BuildPackage,mailsend))
+$(eval $(call BuildPackage,mailsend-nossl))