diff --git a/AUTHORS b/AUTHORS
new file mode 100644
index 0000000000..5f992b932e
--- /dev/null
+++ b/AUTHORS
@@ -0,0 +1,20 @@
+ownCloud is written by:
+	Frank Karlitschek
+	Robin Appelman
+	Jakob Sack
+	Jan-Christoph Borchardt
+	Michael Gapczynski
+	François Kubler
+	Kunal Ghosh
+	Antonio José Gallo Sánchez
+	Arthur Schiwon
+	Kamil Domański
+	Aldo Giambelluca
+	Dominik Schmidt
+	…
+
+With help from many libraries and frameworks including:
+	Open Collaboration Services
+	SabreDAV
+	jQuery
+	…
diff --git a/COPYING-README b/COPYING-README
index 54b959eb01..5f00323b71 100644
--- a/COPYING-README
+++ b/COPYING-README
@@ -1,5 +1,9 @@
-Files in OwnCloud may be copied under the terms of the GNU Affero
-General Public Licence as published by the Free Software Foundation;
-either version 3 of the License, or any later version unless noted otherwise.
+Files in ownCloud are licensed under the Affero General Public License version 3,
+the text of which can be found in COPYING-AGPL, or any later version of the AGPL,
+unless otherwise noted.
 
-Files in inc/ are PHP or other licences as noted.
+Components of ownCloud, including jQuery, are licensed under the MIT/X11 license.
+All unmodified files from these and other sources retain their original copyright
+and license notices: see the relevant individual files.
+
+Attribution information for ownCloud is contained in the AUTHORS file.
diff --git a/README b/README
index ea591935ff..18b817ad34 100644
--- a/README
+++ b/README
@@ -1,16 +1,12 @@
-ownCloud
-========
-An open personal cloud server which runs on your personal server.
-It enables you to access your data from all of your devices.
-ownCloud makes sharing data with other people possible.
-It supports automatic backups, versioning and encryption.
+ownCloud is a personal cloud which runs on your own server.
+It is alpha software in development and should be treated accordingly.
 
-Installation instructions are in the docs directory.
-docs/INSTALL
-
-For more information visit:
 http://owncloud.org
 
-The source code is available at:
-projects.kde.org/projects/playground/www/owncloud
+Installation instructions: http://owncloud.org/index.php/Installation
+Source code: http://projects.kde.org/owncloud
 
+Mailing list: https://mail.kde.org/mailman/listinfo/owncloud
+IRC channel: http://webchat.freenode.net/?channels=#owncloud
+Diaspora: https://joindiaspora.com/u/owncloud
+Identi.ca: http://identi.ca/owncloud