--- pidgin-2.6.1.ebuild
+++ pidgin-2.6.1.ebuild
@@ -13,8 +13,8 @@
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~hppa ~x86"
-IUSE="bonjour dbus debug doc eds gadu gnutls +gstreamer idn meanwhile"
-IUSE="${IUSE} networkmanager nls perl silc tcl tk spell qq gadu"
+IUSE="bonjour dbus debug doc eds gadu gnutls +gstreamer idn meanwhile msn"
+IUSE="${IUSE} myspace networkmanager nls perl silc ssl tcl tk spell qq gadu"
 IUSE="${IUSE} +gtk sasl ncurses groupwise prediction zephyr" # mono"
 
 RDEPEND="
@@ -37,8 +37,14 @@
 		media-plugins/gst-plugins-gconf )
 	perl? ( >=dev-lang/perl-5.8.2-r1 )
 	gadu?  ( net-libs/libgadu[-ssl] )
-	gnutls? ( net-libs/gnutls )
-	!gnutls? ( >=dev-libs/nss-3.11 )
+	ssl? ( 
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/nss-3.11 )
+	)
+	msn? (
+		gnutls? ( net-libs/gnutls )
+		!gnutls? ( >=dev-libs/nss-3.11 )
+	)
 	meanwhile? ( net-libs/meanwhile )
 	silc? ( >=net-im/silc-toolkit-0.9.12-r3 )
 	zephyr? ( >=app-crypt/mit-krb5-1.3.6-r1[krb4] )
@@ -63,7 +69,7 @@
 	nls? ( sys-devel/gettext )"
 
 # Enable Default protocols
-DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple,msn,myspace"
+DYNAMIC_PRPLS="irc,jabber,oscar,yahoo,simple"
 
 # List of plugins
 #   app-accessibility/pidgin-festival
@@ -121,6 +127,10 @@
 		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},bonjour"
 	fi
 
+	if use msn; then
+		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},msn"
+	fi
+
 	if use groupwise; then
 		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},novell"
 	fi
@@ -129,14 +139,23 @@
 		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},zephyr"
 	fi
 
-	if use gnutls ; then
-		einfo "Disabling NSS, using GnuTLS"
-		myconf="${myconf} --enable-nss=no --enable-gnutls=yes"
-		myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
-		myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
+	if use myspace; then
+		DYNAMIC_PRPLS="${DYNAMIC_PRPLS},myspace"
+	fi
+
+	if use ssl || use msn ; then
+		if use gnutls ; then
+			einfo "Disabling NSS, using GnuTLS"
+			myconf="${myconf} --enable-nss=no --enable-gnutls=yes"
+			myconf="${myconf} --with-gnutls-includes=/usr/include/gnutls"
+			myconf="${myconf} --with-gnutls-libs=/usr/$(get_libdir)"
+		else
+			einfo "Disabling GnuTLS, using NSS"
+			myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
+		fi
 	else
-		einfo "Disabling GnuTLS, using NSS"
-		myconf="${myconf} --enable-gnutls=no --enable-nss=yes"
+		einfo "No SSL support selected"
+		myconf="${myconf} --enable-gnutls=no --enalbe-ssl=no"
 	fi
 
 	econf \