diff --git a/dev-python/python-bugzilla/Manifest b/dev-python/python-bugzilla/Manifest
index eaa930469..e8490c7f3 100644
--- a/dev-python/python-bugzilla/Manifest
+++ b/dev-python/python-bugzilla/Manifest
@@ -1,3 +1 @@
-DIST python-bugzilla-0.6.0.tar.bz2 38376 RMD160 8c74aca8757e465b07e02bd2ea6caf86c7f6b762 SHA1 fce7ea15e1998690a4a898a5b6b7616c59b4ee25 SHA256 c6f7be43796bbf2f207d233308e8348e5057cbecd4d493ec34b6377da67991de
-EBUILD python-bugzilla-0.6.0.ebuild 406 RMD160 887a6f2035885dd42edfc9fd1e31f40f0f931606 SHA1 2d81938b917027acdec8b7e16ed0b8a4bc1d4284 SHA256 1b2ea5c5fbb233ec85399c74253f8d41bcbf4d5a440d56401d1ee9bcbeaf4ccb
-MISC Reasons 75 RMD160 1548a002dbf9ab1ef302cbcc1ccb18340d10e689 SHA1 552aeea04bda817ece6f0512433fe3866f80843c SHA256 06930c9fd0fe777030bb78cc15f7f206f32458e250cec59da46fb8d2d59040c7
+DIST python-bugzilla-0.7.0.tar.gz 51451 SHA256 f3fa9ee7fed635f190e23c74e45f22926b84f0310c8e81e2719db4c6732bd99e SHA512 7b58d5076d28835bfa2f8a9732f136831fd6c76b69e519a51293c304013bdcbfcd9a9713b903b1a82fe04595fd6db4f419b6b3e26b449d0cf3b80850dc9913bd WHIRLPOOL 2f40fae0cec31a83a2e217be86ffa5c40ce916d5259faa18ed761bf6c5fea4da5da775fcce8bc0a0a2fe50e418b102c1f7a179b096745b47135718740d12edb3
diff --git a/dev-python/python-bugzilla/files/python-bugzilla-0.7.0-82c2c.patch b/dev-python/python-bugzilla/files/python-bugzilla-0.7.0-82c2c.patch
new file mode 100644
index 000000000..268e00906
--- /dev/null
+++ b/dev-python/python-bugzilla/files/python-bugzilla-0.7.0-82c2c.patch
@@ -0,0 +1,49 @@
+Changes from these upstream commits:
+* Fix typo in default imports, Björn Wingman
+* rhbugzilla: Fix passing in multicall argument, Cole Robinson
+* When logging Bug() info, sort the keys for easy reading, Cole Robinson
+
+diff --git a/bugzilla/__init__.py b/bugzilla/__init__.py
+index 941ea21..1c9f3f5 100644
+--- a/bugzilla/__init__.py
++++ b/bugzilla/__init__.py
+@@ -9,7 +9,7 @@
+ # option) any later version.  See http://www.gnu.org/copyleft/gpl.html for
+ # the full text of the license.
+ 
+-from bugzilla3 import Bugzilla3, Bugzilla32, Bugzilla34, Bugzilla3
++from bugzilla3 import Bugzilla3, Bugzilla32, Bugzilla34, Bugzilla36
+ from bugzilla4 import Bugzilla4
+ from rhbugzilla import RHBugzilla, RHBugzilla3, RHBugzilla4
+ from nvlbugzilla import NovellBugzilla
+diff --git a/bugzilla/base.py b/bugzilla/base.py
+index 7748e2b..fc9e692 100644
+--- a/bugzilla/base.py
++++ b/bugzilla/base.py
+@@ -1173,7 +1173,7 @@ class _Bug(object):
+         self.bugzilla = bugzilla
+         self.autorefresh = True
+         if 'dict' in kwargs and kwargs['dict']:
+-            log.debug("Bug(%s)" % kwargs['dict'].keys())
++            log.debug("Bug(%s)" % sorted(kwargs['dict'].keys()))
+             self.__dict__.update(kwargs['dict'])
+         if 'bug_id' in kwargs:
+             log.debug("Bug(%i)" % kwargs['bug_id'])
+diff --git a/bugzilla/rhbugzilla.py b/bugzilla/rhbugzilla.py
+index 4233d32..b3ec9de 100644
+--- a/bugzilla/rhbugzilla.py
++++ b/bugzilla/rhbugzilla.py
+@@ -42,9 +42,12 @@ class RHBugzilla(Bugzilla4):
+     user_agent = bugzilla.base.user_agent + ' RHBugzilla4/%s' % version
+ 
+     def __init__(self, **kwargs):
++        self.multicall = True
++        if "multicall" in kwargs:
++            self.multicall = kwargs.pop("multicall")
++
+         Bugzilla4.__init__(self, **kwargs)
+         self.user_agent = self.__class__.user_agent
+-        self.multicall = kwargs.get('multicall',True)
+ 
+     #---- Methods and properties with basic bugzilla info
+ 
diff --git a/dev-python/python-bugzilla/python-bugzilla-0.6.0.ebuild b/dev-python/python-bugzilla/python-bugzilla-0.6.0.ebuild
deleted file mode 100644
index 62ba4432f..000000000
--- a/dev-python/python-bugzilla/python-bugzilla-0.6.0.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=3
-inherit distutils eutils
-
-DESCRIPTION="A python library.. for bugzilla!"
-HOMEPAGE="https://fedorahosted.org/python-bugzilla/"
-SRC_URI="https://fedorahosted.org/releases/p/y/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha ~amd64 ia64 ~ppc ppc64 ~sparc x86"
-IUSE=""
diff --git a/dev-python/python-bugzilla/python-bugzilla-0.7.0_p20121019.ebuild b/dev-python/python-bugzilla/python-bugzilla-0.7.0_p20121019.ebuild
new file mode 100644
index 000000000..4362715c6
--- /dev/null
+++ b/dev-python/python-bugzilla/python-bugzilla-0.7.0_p20121019.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit distutils eutils
+
+MY_P=${P%_*}
+DESCRIPTION="A Python library for Bugzilla"
+HOMEPAGE="https://fedorahosted.org/python-bugzilla/"
+SRC_URI="https://fedorahosted.org/releases/p/y/${PN}/${MY_P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+S=${WORKDIR}/${MY_P}
+
+PYTHON_MODNAME="bugzilla"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${MY_P}-82c2c.patch
+	distutils_src_prepare
+}
+
+pkg_postinst() {
+	distutils_pkg_postinst
+	elog "Automatic detection of file type of attachments"
+	elog "requires sys-apps/file compiled with USE=python."
+}