diff --git a/db_structure.xml b/db_structure.xml
index be7208aa22e401a66e6a85bedff2e101813b0efa..e4bd8d998ee183cdea8c482e46466ddd6a44d6a4 100644
--- a/db_structure.xml
+++ b/db_structure.xml
@@ -684,7 +684,8 @@
 			</field>
 
 			<!-- Foreign Key users::uid -->
-            <!-- This is the initiator of the share -->
+            <!-- This is the owner of the share
+                 which does not have to be the initiator of the share -->
 			<field>
 				<name>uid_owner</name>
 				<type>text</type>
@@ -694,18 +695,17 @@
 			</field>
 
 			<!-- Foreign Key users::uid -->
-            <!-- This is the owner of the file, this can be
-                 different from the initiator of the share.
-                 The naming is subobtimal but prevents huge
-                 migration steps -->
+            <!-- This is the initiator of the share -->
 			<field>
-				<name>uid_fileowner</name>
+				<name>uid_initiator</name>
 				<type>text</type>
 				<default></default>
 				<notnull>false</notnull>
 				<length>64</length>
 			</field>
 
+
+
 			<!-- Foreign Key share::id or NULL -->
 			<field>
 				<name>parent</name>
diff --git a/version.php b/version.php
index ca90fdb31675b39021a29160f4cfaeaeea99c29c..b8b1ad2b5fa3c16f14b2835dc9fd1d12e19bc79e 100644
--- a/version.php
+++ b/version.php
@@ -25,7 +25,7 @@
 // We only can count up. The 4. digit is only for the internal patchlevel to trigger DB upgrades
 // between betas, final and RCs. This is _not_ the public version number. Reset minor/patchlevel
 // when updating major/minor version number.
-$OC_Version = array(9, 0, 0, 5);
+$OC_Version = array(9, 0, 0, 6);
 
 // The human readable string
 $OC_VersionString = '9.0 pre alpha';