diff --git a/net-im/pidgin/Manifest b/net-im/pidgin/Manifest
index f68ed85..c9b970f 100644
--- a/net-im/pidgin/Manifest
+++ b/net-im/pidgin/Manifest
@@ -1,5 +1,6 @@
 AUX pidgin-2.10.0-gold.patch 1003 SHA256 26657c717f4e624b0b3af8746b61b0861ba4da65e55e49a753cfefaba72c60cb SHA512 9c54d1da082362325aa5ec0f25356e629adb7f639a0ea98a8aff726e4769cb21bf3350772aa219b7ad021630d13113de02c42317551edfe5f044ae40ac0df984 WHIRLPOOL 77fdb2855ac8fe3dc163a42d18df1847f849d9fc42cb09565746e70e72f9e2f74f3d33f44c6bc6f8277047d6d05bb9f12507a8f8c16e1c672c201a75c8fa7c8b
+AUX pidgin-2.10.7-fix-cap.patch 692 SHA256 4dbf4e8123d7b7550f99fb5b8fb97e98b44551750436ca5327f8257438400dcd SHA512 0a1dc0ceaf78416ecd409a4bdcecef83a48cbdea50314d55a6cb1e1cad06775e1e8ac23f069ef4ed8ca8b4f3bb99f184804fddf7812adfcba8c8920a9c6efdbc WHIRLPOOL 8beca2bcb10380034ccd461559e7504922613de19649ca045e88c19de452bc4beb4b47c4b9976cf24854edf502ce11e74de00f5add86025c4bd066e17e85a962
 DIST pidgin-2.10.7.tar.bz2 10069279 SHA256 eba32994eca20d1cf24a4261b059b2de71a1ec2dd0926e904074b0db49f7f192 SHA512 0f0d421f91be3b1577527f3609bff164d7c57a94338e18dca5d8b7d911634a98b9c0e8860f3e62026eba09a6afb3112a8cd6770a90c89afdb9fb40f83dd6f3e4 WHIRLPOOL 025a392ab069817e2fea07d0e9e7efeee006eaf4ce2e6571c49b851735309f3346bfdbf34c874f55b440b71fbbba0ac55029da727b1f731175d72efb2e74f3b4
-EBUILD pidgin-2.10.7.ebuild 7063 SHA256 0a93350aac7dc1acb744164cf90e69acb5f4cca03cbee1ed5837c24006c2f7fc SHA512 9f4cb49933fdfd06d99913210330bb9831ec60a90e63d6ba32b8b8ccfb63eba1938844a544b35ca29c995fd07c1f9f9936a5ddd46c160306041f9993ab75d2de WHIRLPOOL 32da50ffb1ffe7053c41729cfaff464834b212db1f0530d9eea7fccdf63b1a51d351d61682567e873ec5954537dc143a3916af140ce2366c4c2235fc5997a30c
+EBUILD pidgin-2.10.7.ebuild 7126 SHA256 f129a2f6a825b852be8d615677431ca82e842f051af7e66d27e934e0628ae945 SHA512 1b7dcddccff68773b0efbea7dd115bba1a885917a3e512411e9444aa83158e74162d3a70e3b3942cc70eb3ecb043b0b02b80bda9537400597abc5d8960273286 WHIRLPOOL 83ac6646890966f3e2905bd09a7c20ed5f8ac52d2bcc10e4050c0cc0e6b763b66956c33825b3c230a1f4fecaa67ee8a70d4759fbab4669067aa68b2762bfd649
 MISC ChangeLog 41608 SHA256 a8e2c587ae2c5945407c69b525c9a29e38351a00ca421c636728e22ad1a2cd24 SHA512 f0dee23349a05fa4bd0e8d05b766464a52507c63a9634ffdbbc8cb4b26832995b57cc5b92d012f6a265218291e836fe8f126d8c98f9c54fad0d69380e4bddfab WHIRLPOOL 5c80371afd77d2e05c545ccff485c98c5ff614cb6d7d541655a504dc76183f8225ac1b2e68efb20b49ca386727210ba9c89e5c749641281b66130b17d47209be
 MISC metadata.xml 1311 SHA256 a0253264c64bdd1a4623db7f223cae50450dc8577d74748c25974ca909b80875 SHA512 18570fcf43047336441fd79d0581f6d7010192358a5dfe1d88d29ae33780c44fbc55d26d2c6088f615a87fa4131d729945cb0789941e8470948fc01b3f3f61f1 WHIRLPOOL a716b9e0682c6a56361e2bd6d788eaa8ce35a59aa701b1338a29bb2e34af1be9f579c52ff7698bedd888f7461a32a5abd59bddd95cc58d4633e20e3a394c478e
diff --git a/net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch b/net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch
new file mode 100644
index 0000000..701f386
--- /dev/null
+++ b/net-im/pidgin/files/pidgin-2.10.7-fix-cap.patch
@@ -0,0 +1,21 @@
+
+# HG changeset patch
+# User Daniel Atallah <datallah@pidgin.im>
+# Date 1360879082 0
+# Node ID a860609d9c9ee20a64ca5284f7b50cbc57ae5c92
+# Parent  75999131f023b369df6d4f5b2001e153b448be13
+Fix from David Walser for a crash in the CAP plugin.
+
+diff --git a/pidgin/plugins/cap/cap.c b/pidgin/plugins/cap/cap.c
+--- a/pidgin/plugins/cap/cap.c
++++ b/pidgin/plugins/cap/cap.c
+@@ -43,7 +43,7 @@
+ 	int threshold = purple_prefs_get_int("/plugins/gtk/cap/threshold");
+ 	int min_minute = (current_minute - threshold) % 1440;
+ 	int max_minute = (current_minute + threshold) % 1440;
+-	char *sql, sta_id = NULL;
++	char *sql, *sta_id = NULL;
+ 	sqlite3_stmt *stmt = NULL;
+ 	const char *tail = NULL;
+ 	int rc;
+
diff --git a/net-im/pidgin/pidgin-2.10.7.ebuild b/net-im/pidgin/pidgin-2.10.7.ebuild
index a7d7616..b64279b 100644
--- a/net-im/pidgin/pidgin-2.10.7.ebuild
+++ b/net-im/pidgin/pidgin-2.10.7.ebuild
@@ -134,6 +134,9 @@ pkg_setup() {
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-2.10.0-gold.patch"
+	epatch "${FILESDIR}/${PN}-2.10.7-fix-cap.patch"
+
+	epatch_user
 }
 
 src_configure() {