diff --git a/app-portage/flaggie/flaggie-0.2.1.ebuild b/app-portage/flaggie/flaggie-0.2.1.ebuild
index a20938c13ba69..f2e4670b88149 100644
--- a/app-portage/flaggie/flaggie-0.2.1.ebuild
+++ b/app-portage/flaggie/flaggie-0.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -9,8 +9,8 @@ PYTHON_COMPAT=( python{2_7,3_4} pypy )
 inherit bash-completion-r1 distutils-r1
 
 DESCRIPTION="A smart CLI mangler for package.* files"
-HOMEPAGE="https://bitbucket.org/mgorny/flaggie/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+HOMEPAGE="https://github.com/mgorny/flaggie/"
+SRC_URI="https://github.com/mgorny/flaggie/releases/download/${P}/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-portage/flaggie/flaggie-9999.ebuild b/app-portage/flaggie/flaggie-9999.ebuild
index c46553ddf4ba3..5c32549d341a5 100644
--- a/app-portage/flaggie/flaggie-9999.ebuild
+++ b/app-portage/flaggie/flaggie-9999.ebuild
@@ -1,33 +1,24 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
-PYTHON_COMPAT=( python{2_7,3_4} )
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
 
-inherit bash-completion-r1 distutils-r1
-
-#if LIVE
 EGIT_REPO_URI="https://bitbucket.org/mgorny/${PN}.git"
-inherit git-r3
-#endif
+inherit bash-completion-r1 distutils-r1 git-r3
 
 DESCRIPTION="A smart CLI mangler for package.* files"
 HOMEPAGE="https://bitbucket.org/mgorny/flaggie/"
-SRC_URI="https://www.bitbucket.org/mgorny/${PN}/downloads/${P}.tar.bz2"
+SRC_URI=""
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd"
+KEYWORDS=""
 IUSE=""
 
 RDEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
 
-#if LIVE
-KEYWORDS=
-SRC_URI=
-#endif
-
 python_install_all() {
 	newbashcomp contrib/bash-completion/${PN}.bash-completion ${PN}
 	distutils-r1_python_install_all
diff --git a/app-portage/flaggie/metadata.xml b/app-portage/flaggie/metadata.xml
index 540e3b651b739..5ecf8886a38f2 100644
--- a/app-portage/flaggie/metadata.xml
+++ b/app-portage/flaggie/metadata.xml
@@ -10,7 +10,7 @@
       <email>mgorny@gentoo.org</email>
       <name>Michał Górny</name>
     </maintainer>
-    <bugs-to>https://bitbucket.org/mgorny/flaggie/issues/</bugs-to>
-    <remote-id type="bitbucket">mgorny/flaggie</remote-id>
+	<bugs-to>https://github.com/mgorny/flaggie/issues/</bugs-to>
+    <remote-id type="github">mgorny/flaggie</remote-id>
   </upstream>
 </pkgmetadata>