diff --git a/www-plugins/firebug/Manifest b/www-plugins/firebug/Manifest
index 1215d911b..0ee9844af 100644
--- a/www-plugins/firebug/Manifest
+++ b/www-plugins/firebug/Manifest
@@ -1,2 +1,2 @@
-DIST firebug-2.0.7.xpi 2551635 SHA256 7a8b3de6691d20aef178621bf7f5e000f0271d1e6811a3f8a21984024c365016 SHA512 c90796ad76e6bce4a22f37cf6c790e237dd853fa5f8192a6ad213205739c4e4c9f64f20d6563d29da6ebe6424cf6ab98da4142d8b6a7d20f73d850a81bc3e68c WHIRLPOOL cbb24c56ab950349ef93b217cf6a479c40c0af458e04047f4276154b3d8d0a665d1a25168d4254f9adab8d1d93b888c632f7e64259902fa7c7b5004fc7b20ad7
+DIST firebug-2.0.17.xpi 2617021 SHA256 32a1eef23bdac7bb97a06b527f5c88fe94476755f76b8b1db3b3c66acddd83da SHA512 4a9e0c7bb73aa785cff6e03e49f456e4f5045e387a395259b5b03086ddf10d67f7a117161f057656706e76a98f903cde1b52a270677ddf4419e1e363619db3ab WHIRLPOOL 41e77f4743a7fd784a0ab7f565cadadb18432d1d64f6a80238772c2542befbc982acfe692842b2dbf60b0556ce2b2e577d6e7aad2b6e259ffc65d18e9d8cf32b
 DIST firebug-9999.xpi 2551632 SHA256 6723fb792aa286016be9675ffb96dd314e707b7e3264d9c931807b0a0e14d767 SHA512 e6546021eba68e8e1b9373d8c595d16ee70c22c09f9b717f930a8ddae7afc7fc8a1cab7b102df8780823c3c200300c88979d1b460fd32e904c68fea4087d1f6a WHIRLPOOL e512ea10998b433e19c19fc90d2f8194248b70b357daea2382ce80c656805c4921e2831f201f19bf9114adb85e2d8f4ac42ad44ffbf44d0f12806f98a8ea716e
diff --git a/www-plugins/firebug/firebug-1.12.8b_p1.ebuild b/www-plugins/firebug/firebug-1.12.8b_p1.ebuild
deleted file mode 100644
index e0527fc95..000000000
--- a/www-plugins/firebug/firebug-1.12.8b_p1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=5
-
-inherit mozilla-addon
-
-MOZ_FILEID="253590"
-DESCRIPTION="Powerful web development tool for firefox"
-HOMEPAGE="http://getfirebug.com"
-SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+symlink_all_targets target_firefox target_firefox-bin"
-
-RDEPEND="
-	!symlink_all_targets? (
-		target_firefox? ( >=www-client/firefox-23.0 )
-		target_firefox-bin? ( >=www-client/firefox-bin-23.0 )
-	)"
-
-src_install() {
-	# symlink all possible target paths if this is set
-	if use symlink_all_targets; then
-		MZA_TARGETS="firefox firefox-bin"
-	else
-		use target_firefox && MZA_TARGETS+=" firefox"
-		use target_firefox-bin && MZA_TARGETS+=" firefox-bin"
-	fi
-	mozilla-addon_src_install
-}
diff --git a/www-plugins/firebug/firebug-2.0.7.ebuild b/www-plugins/firebug/firebug-2.0.17.ebuild
similarity index 89%
rename from www-plugins/firebug/firebug-2.0.7.ebuild
rename to www-plugins/firebug/firebug-2.0.17.ebuild
index 6a22ae0e6..0c29064c7 100644
--- a/www-plugins/firebug/firebug-2.0.7.ebuild
+++ b/www-plugins/firebug/firebug-2.0.17.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: $
+# $Id$
 
 EAPI=5
 
 inherit mozilla-addon
 
-MOZ_FILEID="287680"
+MOZ_FILEID="449560"
 DESCRIPTION="Powerful web development tool for firefox"
 HOMEPAGE="http://getfirebug.com"
 SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
@@ -14,7 +14,7 @@ SRC_URI="http://addons.mozilla.org/downloads/file/${MOZ_FILEID} -> ${P}.xpi"
 LICENSE="BSD"
 SLOT="0"
 # blocked because it pulls firefox-bin when I want to keep firefox only
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+symlink_all_targets target_firefox target_firefox-bin"
 
 RDEPEND="