diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ea25eb..fb4eae5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,10 @@
 Current Version
   -
 
+2.6.1 June 5, 2018
+  - Added `HTTPResponseError` to top-level import
+  - Remove `__all__` imports: they never worked
+
 2.6.0 May 17, 2018
   - Added `HTTPResponseError`
 
diff --git a/pybutton/__init__.py b/pybutton/__init__.py
index c40568f..565262b 100644
--- a/pybutton/__init__.py
+++ b/pybutton/__init__.py
@@ -3,8 +3,7 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from pybutton.client import Client
-from pybutton.error import ButtonClientError
-from pybutton.version import VERSION
-
-__all__ = [Client, ButtonClientError, VERSION]
+from pybutton.client import Client # noqa: 401
+from pybutton.error import ButtonClientError # noqa: 401
+from pybutton.error import HTTPResponseError # noqa: 401
+from pybutton.version import VERSION # noqa: 401
diff --git a/pybutton/request.py b/pybutton/request.py
index 0cc1cb8..230aaa7 100644
--- a/pybutton/request.py
+++ b/pybutton/request.py
@@ -64,7 +64,7 @@ def request(url, method, headers, data=None, timeout=None):
 else:
     from urllib2 import Request
     from urllib2 import urlopen
-    from urllib2 import HTTPError
+    from urllib2 import HTTPError # noqa: 401
     from urllib import urlencode
     from urlparse import urlunsplit
     from urlparse import urlparse
@@ -151,13 +151,3 @@ def query_dict(url):
     if (url_components):
         query_string = url_components.query
         return parse_qs(query_string)
-
-
-__all__ = [
-    Request,
-    urlopen,
-    HTTPError,
-    request,
-    request_url,
-    query_dict,
-]
diff --git a/pybutton/resources/__init__.py b/pybutton/resources/__init__.py
index 3d2b0e9..8c6cd0b 100644
--- a/pybutton/resources/__init__.py
+++ b/pybutton/resources/__init__.py
@@ -3,16 +3,8 @@
 from __future__ import print_function
 from __future__ import unicode_literals
 
-from pybutton.resources.accounts import Accounts
-from pybutton.resources.customers import Customers
-from pybutton.resources.links import Links
-from pybutton.resources.merchants import Merchants
-from pybutton.resources.orders import Orders
-
-__all__ = [
-    Accounts,
-    Customers,
-    Links,
-    Merchants,
-    Orders
-]
+from pybutton.resources.accounts import Accounts # noqa: 401
+from pybutton.resources.customers import Customers # noqa: 401
+from pybutton.resources.links import Links # noqa: 401
+from pybutton.resources.merchants import Merchants # noqa: 401
+from pybutton.resources.orders import Orders # noqa: 401
diff --git a/pybutton/version.py b/pybutton/version.py
index 3fd9fb7..bff5353 100644
--- a/pybutton/version.py
+++ b/pybutton/version.py
@@ -1 +1 @@
-VERSION = '2.6.0'
+VERSION = '2.6.1'