diff --git a/mail-client/claws-mail/claws-mail-3.17.6.ebuild b/mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild
similarity index 96%
rename from mail-client/claws-mail/claws-mail-3.17.6.ebuild
rename to mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild
index f7c9b9aac7bc3..02261d5f77519 100644
--- a/mail-client/claws-mail/claws-mail-3.17.6.ebuild
+++ b/mail-client/claws-mail/claws-mail-3.17.6-r1.ebuild
@@ -20,7 +20,7 @@ fi
 SLOT="0"
 LICENSE="GPL-3"
 
-IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
 
 REQUIRED_USE="libcanberra? ( notification )
 	libindicate? ( notification )
@@ -70,7 +70,6 @@ COMMONDEPEND="
 		libindicate? ( dev-libs/libindicate:3[gtk] )
 		libnotify? ( x11-libs/libnotify )
 	)
-	pda? ( >=app-pda/jpilot-0.99 )
 	pdf? ( app-text/poppler[cairo] )
 	pgp? ( >=app-crypt/gpgme-1.0.0 )
 	session? (
@@ -130,6 +129,7 @@ src_configure() {
 		--disable-bsfilter-plugin
 		--disable-fancy-plugin
 		--disable-generic-umpc
+		--disable-jpilot #735118
 		--enable-acpi_notifier-plugin
 		--enable-address_keeper-plugin
 		--enable-alternate-addressbook
@@ -156,7 +156,6 @@ src_configure() {
 		$(use_enable networkmanager)
 		$(use_enable nls)
 		$(use_enable notification notification-plugin)
-		$(use_enable pda jpilot)
 		$(use_enable pdf pdf_viewer-plugin)
 		$(use_enable perl perl-plugin)
 		$(use_enable pgp pgpcore-plugin)
diff --git a/mail-client/claws-mail/claws-mail-9999.ebuild b/mail-client/claws-mail/claws-mail-9999.ebuild
index 935280af79fa1..f3986612859f1 100644
--- a/mail-client/claws-mail/claws-mail-9999.ebuild
+++ b/mail-client/claws-mail/claws-mail-9999.ebuild
@@ -20,7 +20,7 @@ fi
 SLOT="0"
 LICENSE="GPL-3"
 
-IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pda pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
+IUSE="archive bogofilter calendar clamav dbus debug dillo doc gdata +gnutls gtk3 +imap ipv6 ldap +libcanberra +libindicate +libnotify litehtml networkmanager nls nntp +notification pdf perl +pgp python rss session sieve smime spamassassin spam-report spell startup-notification svg valgrind xface"
 REQUIRED_USE="libcanberra? ( notification )
 	libindicate? ( notification )
 	libnotify? ( notification )
@@ -70,7 +70,6 @@ COMMONDEPEND="
 		libindicate? ( dev-libs/libindicate:3[gtk] )
 		libnotify? ( x11-libs/libnotify )
 	)
-	pda? ( >=app-pda/jpilot-0.99 )
 	pdf? ( app-text/poppler[cairo] )
 	pgp? ( >=app-crypt/gpgme-1.0.0 )
 	session? (
@@ -130,6 +129,7 @@ src_configure() {
 		--disable-bsfilter-plugin
 		--disable-fancy-plugin
 		--disable-generic-umpc
+		--disable-jpilot #735118
 		--enable-acpi_notifier-plugin
 		--enable-address_keeper-plugin
 		--enable-alternate-addressbook
@@ -157,7 +157,6 @@ src_configure() {
 		$(use_enable networkmanager)
 		$(use_enable nls)
 		$(use_enable notification notification-plugin)
-		$(use_enable pda jpilot)
 		$(use_enable pdf pdf_viewer-plugin)
 		$(use_enable perl perl-plugin)
 		$(use_enable pgp pgpcore-plugin)