diff --git a/doc/api/statuses_update.bb b/doc/api/statuses_update.bb
new file mode 100644
index 000000000..acad440de
--- /dev/null
+++ b/doc/api/statuses_update.bb
@@ -0,0 +1,23 @@
+[h2]statuses/update[/h2]
+Parameters
+
+    title: Title of the status
+    status: Status in text [or bbcode] format
+    htmlstatus: Status in HTML format
+    in_reply_to_status_id
+    lat: latitude
+    long: longitude
+    media: image data
+    source: Application name
+    group_allow
+    contact_allow
+    group_deny
+    contact_deny
+
+
+Example
+
+[code]
+curl -u theUsername:thePassword http://mywebsite/api/statuses/update.xml -d status='Hello world'
+[/code]
+
diff --git a/include/dir_fns.php b/include/dir_fns.php
index 398f43d00..b9f221bd1 100644
--- a/include/dir_fns.php
+++ b/include/dir_fns.php
@@ -18,7 +18,7 @@ function find_upstream_directory($dirmode) {
 
 	// Thwart attempts to use a private directory
 
-	if(($preferred) && ($prefered != z_root())) {
+	if(($preferred) && ($preferred != z_root())) {
 		$r = q("select * from site where site_url = '%s' limit 1",
 			dbesc($preferred)
 		);
diff --git a/install/schema_postgres.sql b/install/schema_postgres.sql
index 70a7a576a..d60e1bc69 100644
--- a/install/schema_postgres.sql
+++ b/install/schema_postgres.sql
@@ -342,8 +342,8 @@ create index "conv_created_idx" on conv ("created");
 create index "conv_updated_idx" on conv ("updated");
 
 CREATE TABLE IF NOT EXISTS "dreport" (
-  "dreport_id" int(11) NOT NULL,
-  "dreport_channel" int(11) NOT NULL DEFAULT '0',
+  "dreport_id" int NOT NULL,
+  "dreport_channel" int NOT NULL DEFAULT '0',
   "dreport_mid" char(255) NOT NULL DEFAULT '',
   "dreport_site" char(255) NOT NULL DEFAULT '',
   "dreport_recip" char(255) NOT NULL DEFAULT '',
@@ -388,7 +388,7 @@ CREATE TABLE "event" (
   "deny_gid" text NOT NULL,
   "event_status" char(255) NOT NULL DEFAULT '',
   "event_status_date" timestamp NOT NULL DEFAULT '0001-01-01 00:00:00',
-  "event_percent" smallint(6) NOT NULL DEFAULT '0',
+  "event_percent" smallint NOT NULL DEFAULT '0',
   "event_repeat" text NOT NULL,
   "event_sequence" smallint NOT NULL DEFAULT '0',
   "event_priority" smallint NOT NULL DEFAULT '0',
@@ -623,7 +623,7 @@ CREATE TABLE "item" (
   "item_retained" smallint NOT NULL DEFAULT '0',
   "item_rss" smallint NOT NULL DEFAULT '0',
   "item_deleted" smallint NOT NULL DEFAULT '0',
-  "item_type" int(11) NOT NULL DEFAULT '0',
+  "item_type" int NOT NULL DEFAULT '0',
   "item_hidden" smallint NOT NULL DEFAULT '0',
   "item_unpublished" smallint NOT NULL DEFAULT '0',
   "item_delayed" smallint NOT NULL DEFAULT '0',
@@ -918,11 +918,11 @@ CREATE TABLE "photo" (
   "data" bytea NOT NULL,
   "scale" numeric(3) NOT NULL,
   "profile" numeric(1) NOT NULL DEFAULT '0',
-  "photo_usage" smallint(6) NOT NULL DEFAULT '0',
+  "photo_usage" smallint NOT NULL DEFAULT '0',
   "is_nsfw" smallint NOT NULL DEFAULT '0',
   "os_storage" smallint NOT NULL DEFAULT '0',
-  "os_path" mediumtext NOT NULL,
-  "display_path" mediumtext NOT NULL,
+  "os_path" text NOT NULL,
+  "display_path" text NOT NULL,
   "photo_flags" bigint  NOT NULL DEFAULT '0',
   "allow_cid" text NOT NULL,
   "allow_gid" text NOT NULL,
diff --git a/mod/item.php b/mod/item.php
index 5f45a248b..5bf59de26 100644
--- a/mod/item.php
+++ b/mod/item.php
@@ -473,8 +473,9 @@ function item_post(&$a) {
 		require_once('include/text.php');			
 		if($uid && $uid == $profile_uid && feature_enabled($uid,'markdown')) {
 			require_once('include/bb2diaspora.php');
-			$body = escape_tags($body);
 			$body = str_replace("\n",'<br />', $body);
+			$body = purify_html($body);
+
 			$body = preg_replace_callback('/\[share(.*?)\]/ism','share_shield',$body);			
 			$body = diaspora2bb($body,true);
 			$body = preg_replace_callback('/\[share(.*?)\]/ism','share_unshield',$body);
diff --git a/version.inc b/version.inc
index c4168039b..3b6ad6e9a 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-11-10.1212
+2015-11-11.1213