diff --git a/coolamqp/backends/pyamqp.py b/coolamqp/backends/pyamqp.py
index 0338f082174c6e4b7c3ef3c43ab4d94aa0f8fa00..0e7636a3d807fe10fba78592d92a40f9ae98acd5 100644
--- a/coolamqp/backends/pyamqp.py
+++ b/coolamqp/backends/pyamqp.py
@@ -11,9 +11,9 @@ def translate_exceptions(fun):
     def q(*args, **kwargs):
         try:
             return fun(*args, **kwargs)
-        except amqp.ChannelError as e:
+        except amqp.RecoverableChannelError as e:
             raise RemoteAMQPError(e.reply_code, e.reply_text)
-        except (IOError, amqp.ConnectionForced) as e:
+        except (IOError, amqp.ConnectionForced, amqp.IrrecoverableChannelError) as e:
             raise ConnectionFailedError(e.message)
     return q
 
diff --git a/setup.py b/setup.py
index 1bf86e0e4849111768413a55d8b5f752ce898ca0..99363727e4966ad42afc2a8a16f29e730d32615b 100644
--- a/setup.py
+++ b/setup.py
@@ -1,15 +1,19 @@
 #!/usr/bin/env python
-
+#coding=UTF-8
 from distutils.core import setup
 
 setup(name='CoolAMQP',
       version='0.1',
       description='The AMQP client library',
-      author=u'Piotr Maślanka',
+      author=u'DMS Serwis s.c.',
       author_email='piotrm@smok.co',
-      url='https://github.com/piotrmaslanka/coolamqp',
+      url='https://github.com/smok-serwis/coolamqp',
+      download_url='https://github.com/smok-serwis/coolamqp/archive/master.zip',
+      keywords=['amqp', 'pyamqp', 'rabbitmq', 'client', 'network', 'ha', 'high availability'],
       packages=['coolamqp', 'coolamqp.backends'],
-      install_requires=[
+      license='MIT License',
+      long_description='''The Python AMQP client library that makes you forget about all the nasty corner cases about AMQP reconnection''',
+      requires=[
             "amqp"
       ]
      )
\ No newline at end of file