diff --git a/packages/games-engines/love/love-0.10.1.exheres-0 b/packages/games-engines/love/love-0.10.1.exheres-0
index 398dc678..4532fbb9 100644
--- a/packages/games-engines/love/love-0.10.1.exheres-0
+++ b/packages/games-engines/love/love-0.10.1.exheres-0
@@ -1,17 +1,8 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
-LOVE_AUTOCONF="yes"
-
 require love
 
-DOWNLOADS="https://bitbucket.org/rude/love/get/${PV}.tar.bz2 -> ${PNV}.tar.bz2"
-
 PLATFORMS="~amd64 ~x86"
 SLOT="0.10"
 
-src_unpack() {
-    default
-    edo mv rude-love-* "${WORK}"
-}
-
diff --git a/packages/games-engines/love/love.exlib b/packages/games-engines/love/love.exlib
index 7a0679f3..2bd7550d 100644
--- a/packages/games-engines/love/love.exlib
+++ b/packages/games-engines/love/love.exlib
@@ -5,10 +5,10 @@
 # Maintainer: Julian Ospald <hasufell@posteo.de>
 # Exports: src_prepare src_install pkg_postinst
 # Side-effects: - adds build and runtime dependencies
-#               - sets $SUMMARY, $WORK, $HOMEPAGE, $DOWNLOADS, $LICENCES,
+#               - sets $SUMMARY, $HOMEPAGE, $DOWNLOADS, $LICENCES,
 #                      $DEFAULT_SRC_CONFIGURE_PARAMS,
 #                      $DEFAULT_SRC_INSTALL_EXTRA_DOCS,
-#               - imports alternatives, lua,
+#               - imports alternatives, lua, bitbucket
 #                         autotools depending on $LOVE_AUTOCONF
 #
 # Usage
@@ -16,6 +16,7 @@
 
 require alternatives
 require lua [ whitelist="5.1" multibuild="false" ]
+require bitbucket [ user=rude pn=love download=love-${PV}-linux-src ]
 
 if [[ -n ${LOVE_AUTOCONF} ]]; then
     require autotools [ supported_autoconf=[ 2.5 ] supported_automake=[ 1.15 ] ]
@@ -25,7 +26,6 @@ export_exlib_phases src_prepare src_install pkg_postinst
 
 SUMMARY="A framework for 2D games in Lua"
 HOMEPAGE="http://love2d.org/"
-DOWNLOADS="https://bitbucket.org/rude/love/downloads/love-${PV}-linux-src.tar.gz"
 
 LICENCES="ZLIB"
 
diff --git a/packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0 b/packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0
index 1ea96b52..0b8f93f4 100644
--- a/packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0
+++ b/packages/games-strategy/ja2-stracciatella/ja2-stracciatella-0.14.01.exheres-0
@@ -1,10 +1,11 @@
 # Copyright 2016 Julian Ospald <hasufell@posteo.de>
 # Distributed under the terms of the GNU General Public License v2
 
+require bitbucket [ user=gennady tag=v${PV} ]
+
 SUMMARY="A port of Jagged Alliance 2 to SDL"
-HOMEPAGE="https://bitbucket.org/gennady/ja2-stracciatella http://tron.homeunix.org/ja2/"
-DOWNLOADS="https://bitbucket.org/gennady/ja2-stracciatella/get/v${PV}.tar.gz -> ${PNV}.tar.gz
-    mirror://gentoo/editor.slf.gz"
+HOMEPAGE+=" http://tron.homeunix.org/ja2/"
+DOWNLOADS+=" mirror://gentoo/editor.slf.gz"
 
 LICENCES="SFI-SCLA"
 SLOT="0"
@@ -19,7 +20,7 @@ DEFAULT_SRC_PREPARE_PATCHES=( "${FILES}"/${PNV}-makefile.patch )
 
 src_unpack() {
     default
-    edo mv gennady-ja2-stracciatella-* ${PNV}
+    edo mv gennady-ja2-stracciatella-* ${WORK}
 }
 
 src_configure() {