diff --git a/README.md b/README.md
new file mode 100644
index 000000000000..66891600603c
--- /dev/null
+++ b/README.md
@@ -0,0 +1,22 @@
+# ownCloud Demo 
+
+ownCloud is a flexible, open source file sync and share solution. This
+demo shows how easily it can be pushed to Stackato. 
+
+ * Project homepage: http://owncloud.org/ 
+ * The company behind ownCloud: https://owncloud.com/
+ * License: AGPLv3
+
+# Configuration
+
+You may wish to change the admin account login and password which is set
+in the 'config/autoconfig.php' file, also sets the Stackato database
+service credentials the specifies the data directory (linked to the
+filesystem service - see 'stackato.yml').
+
+## Deploying to Stackato
+
+    stackato push -n
+
+**Note**: The initial admin login is the same as your Stackato user
+(email address). The default password is 'changeme'.
diff --git a/config/autoconfig.php b/config/autoconfig.php
new file mode 100644
index 000000000000..6362018e8864
--- /dev/null
+++ b/config/autoconfig.php
@@ -0,0 +1,24 @@
+<?php
+$appinfo = getenv("VCAP_APPLICATION");
+$appinfo_json = json_decode($appinfo,true);
+if (array_key_exists("users", $appinfo_json))
+   $admin = $appinfo_json["users"][0]; 	  	
+else 	
+   $admin = $appinfo_json["group"];
+
+$url_parts = parse_url($_SERVER['DATABASE_URL']);
+$db_name = substr( $url_parts{'path'}, 1 );
+
+$AUTOCONFIG = array(
+"installed" => false,
+"adminlogin" => $admin,
+"adminpass" => "changeme",
+"directory" => "/app/app/data", 
+"dbtype" => "mysql",
+"dbname" => $db_name,
+"dbuser" => $url_parts{'user'},
+"dbpass" => $url_parts{'pass'},
+"dbhost" => $url_parts{'host'},
+"dbtableprefix" => "oc_"
+);
+?>
diff --git a/stackato.yml b/stackato.yml
new file mode 100644
index 000000000000..659bc56ec142
--- /dev/null
+++ b/stackato.yml
@@ -0,0 +1,13 @@
+name: owncloud
+framework: 
+  type: php
+  runtime: php
+mem: 128M
+min_version:
+  client: 1.4.3
+services:
+  ${name}-db: mysql
+  ${name}-fs: filesystem
+hooks:
+  pre-running:
+    - ln -s $STACKATO_FILESYSTEM data