diff --git a/dev-python/wikipedia/Manifest b/dev-python/wikipedia/Manifest
new file mode 100644
index 0000000..c10f1ea
--- /dev/null
+++ b/dev-python/wikipedia/Manifest
@@ -0,0 +1,2 @@
+DIST wikipedia-1.4.0.tar.gz 27748 SHA256 db0fad1829fdd441b1852306e9856398204dc0786d2996dd2e0c8bb8e26133b2 SHA512 56d3382c784fd16205edc5b6f34a8bac5b6fefc21856993413ba339e9e9016b9b65602ed8eaeb1fe593f8eafc6b7b049dba14427cf08e08aabc03fd971504418 WHIRLPOOL 2ea76f2e8a2e71535a037415c0ca31bce8f4307567b3fc6d52203f0c58d5b9b0b7111c6d641f76dd4136b3598fb0b95106c3436bbf0139f22aac431a762254ee
+EBUILD wikipedia-1.4.0.ebuild 508 SHA256 df185c0eb49e44bd47b380f60881e4998c8bd3ab266deee1a2aff61e22d23fe7 SHA512 32fdd0767805a559679511e6794743b161fdd9b8228b4e9f536fc1b4f2897144ae4d2f342104a8ccb163379de0949ee8012dc0019dd5f4dfe0f43678a7fdef8c WHIRLPOOL 9c7c634f38487af3f3dcf7b71ebea034126fba6c49c287072cd7a6500492ffca7ca11d8cd084bdf6ba700e5cddf82e8364fb34dc5f30f6e48843aadaf9e2a38e
diff --git a/dev-python/wikipedia/wikipedia-1.4.0.ebuild b/dev-python/wikipedia/wikipedia-1.4.0.ebuild
new file mode 100644
index 0000000..a602165
--- /dev/null
+++ b/dev-python/wikipedia/wikipedia-1.4.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_7,3_3,3_4} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="Python library that makes it easy to access and parse data from Wikipedia"
+HOMEPAGE="https://github.com/goldsmith/Wikipedia"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+RDEPEND="
+	dev-python/beautifulsoup:4
+	>=dev-python/requests-2.6.0
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE=""
diff --git a/media-sound/lollypop/Manifest b/media-sound/lollypop/Manifest
index 71c64a7..73c5f5e 100644
--- a/media-sound/lollypop/Manifest
+++ b/media-sound/lollypop/Manifest
@@ -1,4 +1,2 @@
-DIST lollypop-0.9.32.tar.xz 424916 SHA256 c23b2b24f8f899d2c91c4890d5744a38b3fcfac5e9cf7777c5dafa8e129fdd2e SHA512 7da6a077b3d750185046180baa05719aaefd9ca394d1b65fbb05952f3a425fe750afdec7110a146b6f72ba52601cfd12d1ff76ed75acb315c9101844c279ae57 WHIRLPOOL 3b8fe6ecb3371f5de723e5c262dd08ae3c11631cce359a92e8f721462ae77762a5a00c7d1988434db1e9bc384500bcfd4e95be39ba726f926452d8ee668a8721
-DIST lollypop-0.9.36.tar.xz 425908 SHA256 5a395e4604113f4b468612552e40e0bf86319d400d3871f940daa6508de37aa3 SHA512 d2ee461d75f2ddac41cd686febdd83d6471a691cce771a300818c4f13a57a75717947071266770998e5bad8289dba12ac9ce3161f106838717f8d32dc8fe50fc WHIRLPOOL 3ee613b57c596406d4d03ab8dc1869cbc9df7caeeae39a337a183f5d1c2d17d382aa13ad0e78684b254bb5c709321aa9703695bc4f8328ab989bdf98dedeb573
-EBUILD lollypop-0.9.32.ebuild 1177 SHA256 ddc2df85dab19408382f2a002f44efcf1aaacb1f95d5436cb3f0cdfe00b14535 SHA512 cb2e40994f9a3b8b587d011893418c75ac15ead2d099406670bd6df600f87e9aa4df7b6c0db9c21489d712d96d04679281f49ebba24985fbcb9b4c7ccaa9a0ac WHIRLPOOL 44a70e408a134954bfb6ea69b120a3de0ce36f2f397c31a3f312e95eac35262be52d84c09de090fe307ef664133f41eb962366e689179322d11e6fe4b8d0884e
-EBUILD lollypop-0.9.36.ebuild 1177 SHA256 ddc2df85dab19408382f2a002f44efcf1aaacb1f95d5436cb3f0cdfe00b14535 SHA512 cb2e40994f9a3b8b587d011893418c75ac15ead2d099406670bd6df600f87e9aa4df7b6c0db9c21489d712d96d04679281f49ebba24985fbcb9b4c7ccaa9a0ac WHIRLPOOL 44a70e408a134954bfb6ea69b120a3de0ce36f2f397c31a3f312e95eac35262be52d84c09de090fe307ef664133f41eb962366e689179322d11e6fe4b8d0884e
+DIST lollypop-0.9.42.tar.xz 440828 SHA256 65d44d073a249d9c9562ed1bbda65bb28173ab86df5dd045034b34e346110d20 SHA512 07a1296bc4bff77b5726d2fdef4a3afd8a11aa9ab3022b1632ac67e523e1dd26cbc0ff607c7c488b5f0ddedee440b55c369c83dea6713dce87e61b77f4b71413 WHIRLPOOL 1164019d8c84f8c80d607628816f174941082bdeb05f6570e8cf25284c593dd62b084ebf3e1bd7586f0acec5b53ea3b0b3b5795b05f355f3ff887af4f842adb0
+EBUILD lollypop-0.9.42.ebuild 1255 SHA256 26a486e3232f98fa40626f7fe5cce16143f2ae69ad902004544c0c2d2260bfd1 SHA512 fbd6de11b3925253f5d34b3da9f262aab08a3e9cab380c6ed36227d8df97019a0dc860889ecc4f1e0a4640b262bcbe2e80c410b9be558c151c09574be115833f WHIRLPOOL 367207e6b74b6799b06763085b8d25d7621b1a7a101fd5775c9aa4b2452a3b0eb7c1294cbfc81c156605eb394ba019fa7f8a5770662b72afced89d851db9c079
diff --git a/media-sound/lollypop/lollypop-0.9.36.ebuild b/media-sound/lollypop/lollypop-0.9.36.ebuild
deleted file mode 100644
index 5edb0b7..0000000
--- a/media-sound/lollypop/lollypop-0.9.36.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-PYTHON_COMPAT=( python{3_3,3_4} )
-PYTHON_REQ_USE="sqlite"
-
-inherit gnome2 python-single-r1
-
-DESCRIPTION="Lollypop is a GNOME music playing application"
-HOMEPAGE="http://gnumdk.github.io/lollypop/"
-SRC_URI="https://github.com/gnumdk/lollypop/releases/download/${PV}/${P}.tar.xz"
-
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~x86 ~amd64"
-IUSE=""
-
-IUSE+=" python_single_target_python3_3 +python_single_target_python3_4"
-
-RDEPEND="${PYTHON_DEPS}
-    >=x11-libs/gtk+-3.13.2:3[introspection]
-    >=dev-libs/gobject-introspection-1.35.9
-    dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]                              
-	dev-python/dbus-python[${PYTHON_USEDEP}]                                    
-	media-libs/gstreamer:1.0[introspection] 
-    >=dev-python/pylast-1.0.0
-    >=dev-libs/totem-pl-parser-3.10.4
-"
-DEPEND="${RDEPEND}
-    >=dev-util/intltool-0.26 
-    dev-util/itstool
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-src_configure() {
-    gnome2_src_configure ITSTOOL="$(type -P true)"
-}
-
-src_install() {
-    gnome2_src_install
-    python_fix_shebang "${ED}"
-}
diff --git a/media-sound/lollypop/lollypop-0.9.32.ebuild b/media-sound/lollypop/lollypop-0.9.42.ebuild
similarity index 90%
rename from media-sound/lollypop/lollypop-0.9.32.ebuild
rename to media-sound/lollypop/lollypop-0.9.42.ebuild
index 5edb0b7..b35c70c 100644
--- a/media-sound/lollypop/lollypop-0.9.32.ebuild
+++ b/media-sound/lollypop/lollypop-0.9.42.ebuild
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/gnumdk/lollypop/releases/download/${PV}/${P}.tar.xz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~x86 ~amd64"
-IUSE=""
+IUSE="+lastfm +wikipedia"
 
 IUSE+=" python_single_target_python3_3 +python_single_target_python3_4"
 
@@ -26,8 +26,9 @@ RDEPEND="${PYTHON_DEPS}
     dev-python/pygobject:3[cairo,${PYTHON_USEDEP}]                              
 	dev-python/dbus-python[${PYTHON_USEDEP}]                                    
 	media-libs/gstreamer:1.0[introspection] 
-    >=dev-python/pylast-1.0.0
     >=dev-libs/totem-pl-parser-3.10.4
+    lastfm? ( >=dev-python/pylast-1.0.0 )
+    wikipedia? ( >=dev-python/wikipedia-1.4.0 )
 "
 DEPEND="${RDEPEND}
     >=dev-util/intltool-0.26