diff --git a/COPYRIGHT b/COPYRIGHT
index b48e73e..5fc7a0c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -140,10 +140,10 @@ under the MIT license: <http://code.google.com/p/django-rosetta/>
 
 
 Upstream Author:
-    mbonetti <http://code.google.com/u/mbonetti/>
+    Marco Bonetti <mbonetti@gmail.com>
 
 Copyright:
-    <Copyright © 2010, mbonetti>
+    <Copyright © 2010, Marco Bonetti>
     All rights reserved.
 
 License:
diff --git a/pyweb/rosetta/__init__.py b/pyweb/rosetta/__init__.py
index 248ed45..e7a30fd 100644
--- a/pyweb/rosetta/__init__.py
+++ b/pyweb/rosetta/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- *  Copyright (C) 2010, mbonetti <http://code.google.com/u/mbonetti/>
+ *  Copyright (C) 2010, Marco Bonetti <mbonetti@gmail.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
diff --git a/pyweb/rosetta/conf/__init__.py b/pyweb/rosetta/conf/__init__.py
index 76f7515..b4b4bd6 100644
--- a/pyweb/rosetta/conf/__init__.py
+++ b/pyweb/rosetta/conf/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- *  Copyright (C) 2010, mbonetti <http://code.google.com/u/mbonetti/>
+ *  Copyright (C) 2010, Marco Bonetti <mbonetti@gmail.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
diff --git a/pyweb/rosetta/conf/settings.py b/pyweb/rosetta/conf/settings.py
index f8b8849..070bad3 100644
--- a/pyweb/rosetta/conf/settings.py
+++ b/pyweb/rosetta/conf/settings.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- *  Copyright (C) 2010, mbonetti <http://code.google.com/u/mbonetti/>
+ *  Copyright (C) 2010, Marco Bonetti <mbonetti@gmail.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
diff --git a/pyweb/rosetta/models.py b/pyweb/rosetta/models.py
index 6f6ad32..627671b 100644
--- a/pyweb/rosetta/models.py
+++ b/pyweb/rosetta/models.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- *  Copyright (C) 2010, mbonetti <http://code.google.com/u/mbonetti/>
+ *  Copyright (C) 2010, Marco Bonetti <mbonetti@gmail.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
diff --git a/pyweb/rosetta/poutil.py b/pyweb/rosetta/poutil.py
index 6a070fa..5ae0212 100644
--- a/pyweb/rosetta/poutil.py
+++ b/pyweb/rosetta/poutil.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- *  Copyright (C) 2010, mbonetti <http://code.google.com/u/mbonetti/>
+ *  Copyright (C) 2010, Marco Bonetti <mbonetti@gmail.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
diff --git a/pyweb/rosetta/templatetags/__init__.py b/pyweb/rosetta/templatetags/__init__.py
index 76f7515..b4b4bd6 100644
--- a/pyweb/rosetta/templatetags/__init__.py
+++ b/pyweb/rosetta/templatetags/__init__.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- *  Copyright (C) 2010, mbonetti <http://code.google.com/u/mbonetti/>
+ *  Copyright (C) 2010, Marco Bonetti <mbonetti@gmail.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
diff --git a/pyweb/rosetta/templatetags/rosetta.py b/pyweb/rosetta/templatetags/rosetta.py
index 3d3a6e5..580bd1e 100644
--- a/pyweb/rosetta/templatetags/rosetta.py
+++ b/pyweb/rosetta/templatetags/rosetta.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- *  Copyright (C) 2010, mbonetti <http://code.google.com/u/mbonetti/>
+ *  Copyright (C) 2010, Marco Bonetti <mbonetti@gmail.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
diff --git a/pyweb/rosetta/urls.py b/pyweb/rosetta/urls.py
index 4c6fa9e..c476ed1 100644
--- a/pyweb/rosetta/urls.py
+++ b/pyweb/rosetta/urls.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- *  Copyright (C) 2010, mbonetti <http://code.google.com/u/mbonetti/>
+ *  Copyright (C) 2010, Marco Bonetti <mbonetti@gmail.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal
diff --git a/pyweb/rosetta/views.py b/pyweb/rosetta/views.py
index dad7329..ade9ff5 100644
--- a/pyweb/rosetta/views.py
+++ b/pyweb/rosetta/views.py
@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 """
- *  Copyright (C) 2010, mbonetti <http://code.google.com/u/mbonetti/>
+ *  Copyright (C) 2010, Marco Bonetti <mbonetti@gmail.com>
  *
  *  Permission is hereby granted, free of charge, to any person obtaining a copy
  *  of this software and associated documentation files (the "Software"), to deal