diff --git a/OpenUDID_manager.java b/OpenUDID_manager.java
index 33f492c..a2391ce 100644
--- a/OpenUDID_manager.java
+++ b/OpenUDID_manager.java
@@ -1,4 +1,4 @@
-package com.OpenUDID;
+package org.OpenUDID;
 
 import java.math.BigInteger;
 import java.security.SecureRandom;
@@ -162,7 +162,7 @@ public static void sync(Context context) {
 		if (OpenUDID == null) //Not found
 		{
 			//Get the list of all OpenUDID services available (including itself)
-			manager.mMatchingIntents = context.getPackageManager().queryIntentServices(new Intent("com.OpenUDID.GETUDID"), 0);
+			manager.mMatchingIntents = context.getPackageManager().queryIntentServices(new Intent("org.OpenUDID.GETUDID"), 0);
 			if (LOG) Log.d(TAG, manager.mMatchingIntents.size() + " services matches OpenUDID");
 			
 			if (manager.mMatchingIntents != null)
diff --git a/OpenUDID_service.java b/OpenUDID_service.java
index 11b9eb0..a2784c3 100644
--- a/OpenUDID_service.java
+++ b/OpenUDID_service.java
@@ -1,4 +1,4 @@
-package com.OpenUDID;
+package org.OpenUDID;
 
 import android.app.Service;
 import android.content.Context;
@@ -11,9 +11,9 @@
 /*
  * You have to add this in your manifest
  
-<service android:name="com.OpenUDID.OpenUDID_service">
+<service android:name="org.OpenUDID.OpenUDID_service">
 	<intent-filter>
-		<action android:name="com.OpenUDID.GETUDID" />
+		<action android:name="org.OpenUDID.GETUDID" />
 	</intent-filter>
 </service>
 
diff --git a/README b/README
index 509f619..51eff43 100644
--- a/README
+++ b/README
@@ -8,8 +8,16 @@ _/    _/  _/    _/  _/        _/    _/  _/    _/  _/    _/    _/    _/    _/
        _/                                                                        
 
 //  Created by Victor Vieux on 9/9/11.
-//  Copyright 2011 OpenUDID.com
+//  Copyright 2011 OpenUDID.org
 //
+//  iOS / MacOS code: https://github.com/ylechelle/OpenUDID
+//  Android code: https://github.com/vieux/OpenUDID
+//
+//  Contributors:
+//      https://github.com/ylechelle (initiator & iOS code)
+//      https://github.com/samrobbins (Mac OS port)
+//      https://github.com/vieux (Android version)
+
 Synopsis: an open source project to provide a universal and persistent
           Unique Device IDentifier (UDID) solution for Android