diff --git a/AUTHORS b/AUTHORS
index c79c70f..a40157c 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,4 +1,5 @@
 Christian Metts
+Jannis Leidel
 
 Django Compressor's filters started life as the filters from Andreas Pelme's
 django-compress.
@@ -12,7 +13,6 @@ Carl Meyer
 Chris Adams
 David Ziegler
 Gert Van Gool
-Jannis Leidel
 Justin Lilly
 Maciek Szczesniak
 Mehmet S. Catalbas
diff --git a/setup.py b/setup.py
index b355734..10ad32e 100644
--- a/setup.py
+++ b/setup.py
@@ -9,13 +9,10 @@ README = read('README.rst')
 setup(
     name = "django_compressor",
     version = "0.6a8",
-    url = 'http://github.com/mintchaos/django_compressor',
+    url = 'http://github.com/jezdez/django_compressor',
     license = 'BSD',
     description = "Compresses linked and inline javascript or CSS into a single cached file.",
     long_description = README,
-
-    author = 'Christian Metts',
-    author_email = 'xian@mintchaos.com',
     packages = [
         'compressor',
         'compressor.conf',
@@ -26,6 +23,8 @@ setup(
         'compressor.management',
         'compressor.management.commands',
     ],
+    author = 'Jannis Leidel',
+    author_email = 'jannis@leidel.info',
     package_data = {
         'compressor': [
                 'templates/compressor/*.html',