--- a/History.txt
+++ b/History.txt
@@ -1,3 +1,13 @@
+== 0.6.0 2008-05-12
+
+* Major enhancements:
+  * Major Persistable module improvements thanks to Sebastian Probst Eide;
+  * Associations (has_one, has_many)
+  * Timestamping
+  * Defaults to setting instance variables (if no (de)serialization methods provided)
+  * The Ruby view server has been removed from the distribution
+  * Many small fixes and updates
+
 == 0.5.0 2007-09-15
 
 * 1 major enhancement:

--- a/Manifest.txt
+++ b/Manifest.txt
@@ -4,15 +4,16 @@ Manifest.txt
 README.txt
 Rakefile
 TODO
-bin/couch_ruby_view_requestor
 config/hoe.rb
 config/requirements.rb
 lib/couch_object.rb
 lib/couch_object/database.rb
 lib/couch_object/document.rb
-lib/couch_object/model.rb
+lib/couch_object/error_classes.rb
 lib/couch_object/persistable.rb
-lib/couch_object/proc_condition.rb
+lib/couch_object/persistable/has_many_relations_array.rb
+lib/couch_object/persistable/meta_classes.rb
+lib/couch_object/persistable/overloaded_methods.rb
 lib/couch_object/response.rb
 lib/couch_object/server.rb
 lib/couch_object/utils.rb
@@ -25,13 +26,36 @@ script/generate
 script/txt2html
 setup.rb
 spec/database_spec.rb
+spec/database_spec.rb.orig
 spec/document_spec.rb
 spec/integration/database_integration_spec.rb
 spec/integration/document_integration_spec.rb
 spec/integration/integration_helper.rb
-spec/model_spec.rb
-spec/persistable_spec.rb
-spec/proc_condition_spec.rb
+spec/persistable/callback.rb
+spec/persistable/callback_spec.rb
+spec/persistable/cloning.rb
+spec/persistable/cloning_spec.rb
+spec/persistable/comparing_objects.rb
+spec/persistable/comparing_objects_spec.rb
+spec/persistable/deleting.rb
+spec/persistable/deleting_spec.rb
+spec/persistable/error_messages.rb
+spec/persistable/error_messages_spec.rb
+spec/persistable/loading.rb
+spec/persistable/loading_spec.rb
+spec/persistable/new_methods.rb
+spec/persistable/new_methods_spec.rb
+spec/persistable/persistable_helper.rb
+spec/persistable/relations.rb
+spec/persistable/relations_spec.rb
+spec/persistable/saving.rb
+spec/persistable/saving_spec.rb
+spec/persistable/setting_storage_location.rb
+spec/persistable/setting_storage_location_spec.rb
+spec/persistable/timestamps.rb
+spec/persistable/timestamps_spec.rb
+spec/persistable/unsaved_changes.rb
+spec/persistable/unsaved_changes_spec.rb
 spec/response_spec.rb
 spec/rspec_autotest.rb
 spec/server_spec.rb

--- a/lib/couch_object/version.rb
+++ b/lib/couch_object/version.rb
@@ -1,7 +1,7 @@
 module CouchObject #:nodoc:
   module VERSION #:nodoc:
     MAJOR = 0
-    MINOR = 5
+    MINOR = 6
     TINY  = 0
 
     STRING = [MAJOR, MINOR, TINY].join('.')

--- a/website/index.html
+++ b/website/index.html
@@ -33,7 +33,7 @@
     <h1>CouchObject</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/couch_object"; return false'>
       <p>Get Version</p>
-      <a href="http://rubyforge.org/projects/couch_object" class="numbers">0.5.0</a>
+      <a href="http://rubyforge.org/projects/couch_object" class="numbers">0.6.0</a>
     </div>
     <h1>&#x2192; &#8216;couch_object&#8217;</h1>
 
@@ -41,7 +41,7 @@
 	<h2>What</h2>
 
 
-	<p>CouchObject is a set of classes to help you talk to <a href="http://couchdbwiki.com/">CouchDb</a> with and in Ruby.</p>
+	<p>CouchObject is a set of classes to help you talk to <a href="http://incubator.apache.org/couchdb/">CouchDB</a> with and in Ruby.</p>
 
 
 	<h2>Installing</h2>
@@ -59,30 +59,45 @@
 	<p>See the <a href="http://couchobject.rubyforge.org/rdoc/">RDoc</a></p>
 
 
-	<h2>How to submit patches</h2>
+	<h2>Getting the source and how to submit patches</h2>
+
+
+	<h3>Getting the source</h3>
 
 
 <pre>
-  $ git clone git://repo.or.cz/couchobject.git
+  $ git clone git://gitorious.org/couchobject/mainline.git
 </pre>
 
+	<h3>Contributing</h3>
+
+
+	<p>Create a public clone on http://gitorious.org/projects/couchobject and submit a merge request via the web interface.</p>
+
+
 	<h2>License</h2>
 
 
 	<p>This code is free to use under the terms of the <span class="caps">MIT</span> license.</p>
 
 
-	<h2>Contact</h2>
+	<h2>Authors &#38; Contact</h2>
 
 
 	<ul>
 	<li>Author: Johan Sørensen</li>
 		<li>Contact: johan (at) johansorensen <span class="caps">DOT</span> com</li>
 		<li>Home: <a href="http://rubyforge.org/projects/couchobject/">Rubyforge</a> | <a href="http://couchobject.rubyforge.org">Rubyforge hme</a></li>
-		<li>Source (Git): <a href="http://repo.or.cz/w/couchobject.git">http://repo.or.cz/w/couchobject.git</a></li>
+		<li>Source (Git): <a href="http://gitorious.org/projects/couchobject">http://gitorious.org/projects/couchobject</a></li>
+	</ul>
+
+
+	<ul>
+	<li>Author: Sebastian Probst Eide</li>
+		<li>Contact: sebastian.probst.eide (at) gmail <span class="caps">DOT</span> com</li>
 	</ul>
     <p class="coda">
-      <a href="">TODO</a>, 15th September 2007<br>
+      <a href="">TODO</a>, 12th May 2008<br>
       Theme extended from <a href="http://rb2js.rubyforge.org/">Paul Battley</a>
     </p>
 </div>

--- a/website/index.txt
+++ b/website/index.txt
@@ -5,7 +5,7 @@ h1. → 'couch_object'
 
 h2. What
 
-CouchObject is a set of classes to help you talk to "CouchDb":http://couchdbwiki.com/ with and in Ruby.
+CouchObject is a set of classes to help you talk to "CouchDB":http://incubator.apache.org/couchdb/ with and in Ruby.
 
 h2. Installing
 
@@ -18,17 +18,23 @@ h2. Demonstration of usage
 
 See the "RDoc":http://couchobject.rubyforge.org/rdoc/
 
-h2. How to submit patches
+h2. Getting the source and how to submit patches
+
+h3. Getting the source
 
 <pre>
-  $ git clone git://repo.or.cz/couchobject.git
+  $ git clone git://gitorious.org/couchobject/mainline.git
 </pre>
 
+h3. Contributing
+
+Create a public clone on http://gitorious.org/projects/couchobject and submit a merge request via the web interface.
+
 h2. License
 
 This code is free to use under the terms of the MIT license. 
 
-h2. Contact
+h2. Authors & Contact
 
 * Author: Johan Sørensen
 * Contact: johan (at) johansorensen DOT com