diff --git a/libertree.tar.gz b/libertree.tar.gz
new file mode 100644
index 000000000..b38846f05
Binary files /dev/null and b/libertree.tar.gz differ
diff --git a/libertree/libertree.css b/libertree/libertree.css
new file mode 100755
index 000000000..cb401d55e
--- /dev/null
+++ b/libertree/libertree.css
@@ -0,0 +1,16 @@
+
+#libertree-enable-label, #libertree-username-label, #libertree-password-label, #libertree-bydefault-label {
+	float: left;
+	width: 200px;
+	margin-top: 10px;
+}
+
+#libertree-checkbox, #libertree-username, #libertree-password, #libertree-bydefault {
+	float: left;
+	margin-top: 10px;
+}
+
+#libertree-submit {
+	margin-top: 15px;
+}
+
diff --git a/libertree/libertree.php b/libertree/libertree.php
new file mode 100755
index 000000000..e91996cca
--- /dev/null
+++ b/libertree/libertree.php
@@ -0,0 +1,195 @@
+<?php
+
+/**
+ * Name: Libertree Post Connector
+ * Description: Post to libertree accounts
+ * Version: 1.0
+ * Author: Tony Baldwin <https://free-haven.org/u/tony>
+ */
+
+function libertree_install() {
+    register_hook('post_local',           'addon/libertree/libertree.php', 'libertree_post_local');
+    register_hook('notifier_normal',      'addon/libertree/libertree.php', 'libertree_send');
+    register_hook('jot_networks',         'addon/libertree/libertree.php', 'libertree_jot_nets');
+    register_hook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
+    register_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
+
+}
+function libertree_uninstall() {
+    unregister_hook('post_local',       'addon/libertree/libertree.php', 'libertree_post_local');
+    unregister_hook('notifier_normal',  'addon/libertree/libertree.php', 'libertree_send');
+    unregister_hook('jot_networks',     'addon/libertree/libertree.php', 'libertree_jot_nets');
+    unregister_hook('connector_settings',      'addon/libertree/libertree.php', 'libertree_settings');
+    unregister_hook('connector_settings_post', 'addon/libertree/libertree.php', 'libertree_settings_post');
+}
+
+
+function libertree_jot_nets(&$a,&$b) {
+    if(! local_user())
+        return;
+
+    $ltree_post = get_pconfig(local_user(),'libertree','post');
+    if(intval($ltree_post) == 1) {
+        $ltree_defpost = get_pconfig(local_user(),'libertree','post_by_default');
+        $selected = ((intval($ltree_defpost) == 1) ? ' checked="checked" ' : '');
+        $b .= '<div class="profile-jot-net"><input type="checkbox" name="libertree_enable"' . $selected . 'value="1" /> '
+            . t('Post to libertree') . '</div>';
+    }
+}
+
+
+function libertree_settings(&$a,&$s) {
+
+    if(! local_user())
+        return;
+
+    /* Add our stylesheet to the page so we can make our settings look nice */
+
+    $a->page['htmlhead'] .= '<link rel="stylesheet"  type="text/css" href="' . $a->get_baseurl() . '/addon/libertree/libertree.css' . '" media="all" />' . "\r\n";
+
+    /* Get the current state of our config variables */
+
+    $enabled = get_pconfig(local_user(),'libertree','post');
+
+    $checked = (($enabled) ? ' checked="checked" ' : '');
+
+    $def_enabled = get_pconfig(local_user(),'libertree','post_by_default');
+
+    $def_checked = (($def_enabled) ? ' checked="checked" ' : '');
+
+    $ltree_api_token = get_pconfig(local_user(), 'libertree', 'libertree_api_token');
+    $ltree_url = get_pconfig(local_user(), 'libertree', 'libertree_url');
+
+
+    /* Add some HTML to the existing form */
+
+    $s .= '<div class="settings-block">';
+    $s .= '<h3>' . t('libertree Post Settings') . '</h3>';
+    $s .= '<div id="libertree-enable-wrapper">';
+    $s .= '<label id="libertree-enable-label" for="libertree-checkbox">' . t('Enable Libertree Post Plugin') . '</label>';
+    $s .= '<input id="libertree-checkbox" type="checkbox" name="libertree" value="1" ' . $checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="libertree-api_token-wrapper">';
+    $s .= '<label id="libertree-api_token-label" for="libertree-api_token">' . t('Libertree API token') . '</label>';
+    $s .= '<input id="libertree-api_token" type="text" name="libertree_api_token" value="' . $ltree_api_token . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="libertree-url-wrapper">';
+    $s .= '<label id="libertree-url-label" for="libertree-url">' . t('Libertree site URL') . '</label>';
+    $s .= '<input id="libertree-url" type="text" name="libertree_url" value="' . $ltree_url . '" />';
+    $s .= '</div><div class="clear"></div>';
+
+    $s .= '<div id="libertree-bydefault-wrapper">';
+    $s .= '<label id="libertree-bydefault-label" for="libertree-bydefault">' . t('Post to Libertree by default') . '</label>';
+    $s .= '<input id="libertree-bydefault" type="checkbox" name="libertree_bydefault" value="1" ' . $def_checked . '/>';
+    $s .= '</div><div class="clear"></div>';
+
+    /* provide a submit button */
+
+    $s .= '<div class="settings-submit-wrapper" ><input type="submit" id="libertree-submit" name="libertree-submit" class="settings-submit" value="' . t('Submit') . '" /></div></div>';
+
+}
+
+
+function libertree_settings_post(&$a,&$b) {
+
+	if(x($_POST,'libertree-submit')) {
+
+		set_pconfig(local_user(),'libertree','post',intval($_POST['libertree']));
+		set_pconfig(local_user(),'libertree','post_by_default',intval($_POST['libertree_bydefault']));
+		set_pconfig(local_user(),'libertree','libertree_api_token',trim($_POST['libertree_api_token']));
+		set_pconfig(local_user(),'libertree','libertree_url',trim($_POST['libertree_url']));
+
+	}
+
+}
+
+function libertree_post_local(&$a,&$b) {
+
+	// This can probably be changed to allow editing by pointing to a different API endpoint
+
+	if($b['edit'])
+		return;
+
+	if((! local_user()) || (local_user() != $b['uid']))
+		return;
+
+	if($b['private'] || $b['parent'])
+		return;
+
+    $ltree_post   = intval(get_pconfig(local_user(),'libertree','post'));
+
+	$ltree_enable = (($ltree_post && x($_REQUEST,'libertree_enable')) ? intval($_REQUEST['libertree_enable']) : 0);
+
+	if($_REQUEST['api_source'] && intval(get_pconfig(local_user(),'libertree','post_by_default')))
+		$ltree_enable = 1;
+
+    if(! $ltree_enable)
+       return;
+
+    if(strlen($b['postopts']))
+       $b['postopts'] .= ',';
+     $b['postopts'] .= 'libertree';
+}
+
+
+
+
+function libertree_send(&$a,&$b) {
+
+	logger('libertree_send: invoked');
+	return;
+
+    if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
+        return;
+
+    if(! strstr($b['postopts'],'libertree'))
+        return;
+
+    if($b['parent'] != $b['id'])
+        return;
+
+
+	$ltree_api_token = get_pconfig($b['uid'],'libertree','libertree_api_token');
+	$ltree_url = get_pconfig($b['uid'],'libertree','libertree_url');
+	$ltree_blog = "$ltree_url/api/v1/posts/create/?token=$ltree_api_token";
+
+	if($ltree_url && $ltree_api_token && $ltree_blog) {
+
+		require_once('include/bb2diaspora.php');
+		$tag_arr = array();
+		$tags = '';
+		$x = preg_match_all('/\#\[(.*?)\](.*?)\[/',$b['tag'],$matches,PREG_SET_ORDER);
+
+		if($x) {
+			foreach($matches as $mtch) {
+				$tag_arr[] = $mtch[2];
+			}
+		}
+		if(count($tag_arr))
+			$tags = implode(',',$tag_arr);		
+
+
+		$params = array(
+			'text' => bb2diaspora($b['body'])
+		//	'token' => $ltree_api_token
+		);
+	
+		$ch = curl_init();
+		curl_setopt($ch, CURLOPT_URL, $ltree_blog);
+		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
+		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
+		curl_setopt($ch, CURLOPT_HEADER, false);
+		curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
+		curl_setopt($ch, CURLOPT_POST, true);
+		curl_setopt($ch, CURLOPT_POSTFIELDS, $params);
+
+		$data = curl_exec($ch);
+		$result = curl_multi_getcontent($ch);
+		curl_close($ch);
+
+		logger('libertree_send: ' . $result);
+	}
+}
+
diff --git a/posterous/posterous-api.php b/posterous/posterous-api.php
deleted file mode 100755
index b9dd7d9c5..000000000
--- a/posterous/posterous-api.php
+++ /dev/null
@@ -1,248 +0,0 @@
-<?php /*
-Name: Posterous API Library
-Description: Object-oriented PHP class for accessing the Posterous API
-Author: Calvin Freitas
-Version: 0.1.0
-Author URI: http://calvinf.com/
-License:  MIT License (see LICENSE) http://creativecommons.org/licenses/MIT/
-Warranties: None
-Last Modified: December 07, 2009
-Requirements: PHP 5 or higher.
-*/
-
-/*
-Copyright (c) 2009 Calvin Freitas
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
-*/
-
-/* Define Static Variables */
-define('POSTEROUS_API_LIBRARY_VERSION','1.0');
-define('POSTEROUS_API_LIBRARY_RELEASE_DATE','December 07, 2009');
-define('POSTEROUS_API_LIBRARY_URL','http://calvinf.com/projects/posterous-api-library-php/');
-define('POSTEROUS_API_LIBRARY_AUTHOR_NAME','Calvin Freitas');
-define('POSTEROUS_API_LIBRARY_AUTHOR_URL','http://calvinf.com/');
-define('POSTEROUS_API_LIBRARY_AUTHOR_EMAIL','cal@calvinfreitas.com');
-
-define('POSTEROUS_API_URL', 'http://posterous.com/api/');
-
-// ensure Curl extension installed
-if(!extension_loaded("curl")) {
-	throw(new Exception("The Curl extension for PHP is required for PosterousAPI to work."));
-}
-
-/* Useful to catch this exception separately from standard PHP Exceptions */
-class PosterousException extends Exception {}
-
-/* This class contains functions for calling the Posterous API */
-class PosterousAPI {
-	private $user;
-	private $pass;
-
-	function __construct($user = NULL, $pass = NULL) {
-		$this->user = $user;
-		$this->pass = $pass;
-	}
-
-	/* Reading Methods - http://posterous.com/api/reading */
-	function getsites() {
-		$api_method = 'getsites';
-		$xml = $this->_call( $api_method );
-		return $xml;
-	}
-
-	function readposts($args) {
-		$api_method = 'readposts';
-
-		$valid_args = array('hostname','site_id','num_posts','page','tag');
-		$method_args = $this->_validate($args, $valid_args);
-
-		$xml = $this->_call( $api_method, $method_args );
-		return $xml;
-	}
-
-	function gettags($args) {
-		$api_method = 'gettags';
-
-		$valid_args = array('hostname','site_id');
-		$method_args = $this->_validate($args, $valid_args);
-
-		$xml = $this->_call( $api_method, $method_args );
-		return $xml;
-	}
-
-	/* Posting Methods - http://posterous.com/api/posting */
-	function newpost($args) {
-		$api_method = 'newpost';
-
-		if (!$this->_auth()) {
-			throw new PosterousException('Posterous API call "' . $api_method . '" requires authentication.');
-		}
-
-		$valid_args = array('site_id','media','title','body','autopost','private','date','tags','source','sourceLink');
-		$method_args = $this->_validate($args, $valid_args);
-
-		$xml = $this->_call( $api_method, $method_args );
-		return $xml;
-	}
-
-	function updatepost($args) {
-		$api_method = 'updatepost';
-
-		if (!$this->_auth()) {
-			throw new PosterousException('Posterous API call "' . $api_method . '" requires authentication.');
-		}
-
-		$valid_args = array('post_id','media','title','body');
-		$method_args = $this->_validate($args, $valid_args);
-
-		$xml = $this->_call( $api_method, $method_args );
-		return $xml;
-	}
-
-	function newcomment($args) {
-		$api_method = 'newcomment';
-
-		$valid_args = array('post_id','comment','name','email','date');
-		$method_args = $this->_validate($args, $valid_args);
-
-		$xml = $this->_call( $api_method, $method_args );
-		return $xml;
-	}
-
-	/* Post.ly Methods - http://posterous.com/api/postly */
-
-	function getpost($args) {
-		$api_method = 'getpost';
-
-		$valid_args = array('id');
-		$method_args = $this->_validate($args, $valid_args);
-
-		$xml = $this->_call( $api_method, $method_args );
-		return $xml;
-	}
-
-	/* Twitter Methods - http://posterous.com/api/twitter */
-	function upload() {
-		$api_method = 'upload';
-
-		$valid_args = array('username','password','media','message','body','source','sourceLink');
-		$method_args = $this->_validate( $args, $method_args );
-
-		$xml = $this->_call( $api_method, $method_args );
-		return $xml;
-	}
-
-	function uploadAndPost() {
-		$api_method = 'uploadAndPost';
-
-		$valid_args = array('username','password','media','message','body','source','sourceLink');
-		$method_args = $this->_validate( $args, $method_args );
-
-		$xml = $this->_call( $api_method, $method_args );
-		return $xml;
-	}
-
-
-	/* Helper Functions */
-	private function _call($api_method, $method_args = NULL) {
-		$method_url = POSTEROUS_API_URL . $api_method;
-
-		$user = $this->user();
-		$pass = $this->pass();
-
-		$ch = curl_init();
-		curl_setopt($ch, CURLOPT_URL, $method_url);
-		curl_setopt($ch, CURLOPT_RETURNTRANSFER, 1);
-		curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 5);
-		curl_setopt($ch, CURLOPT_HEADER, false);
-		curl_setopt($ch, CURLOPT_HTTPAUTH, CURLAUTH_BASIC);
-
-		if (isset($user) && isset($pass) && $user != '' && $pass != '') {
-			curl_setopt($ch, CURLOPT_USERPWD, $user . ':' . $pass);
-		}
-
-		curl_setopt($ch, CURLOPT_POST, 1);
-
-		if ( is_array($method_args) && !empty($method_args) ) {
-			curl_setopt($ch, CURLOPT_POSTFIELDS, $method_args);
-		}
-
-		$data = curl_exec($ch);
-		//$response_code = curl_getinfo($curl, CURLINFO_HTTP_CODE);
-		curl_close($ch);
-
-		$xml = '';
-		try {
-			$xml = new SimpleXMLElement($data);
-
-			$response_status = $xml['stat'];
-			if ($response_status == 'ok') {
-				return $xml;
-			}
-			elseif ($response_status == 'fail') {
-				throw new PosterousException('Error Code ' . $xml->err['code'] . ': ' . $xml->err['msg']);
-			}
-			else {
-				throw new PosterousException('Error: Invalid Posterous response status.');
-			}
-		}
-		catch (Exception $e) {
-			throw $e;
-		}
-	}
-
-	private function _validate($args, $valid_args) {
-		$method_args = array();
-		foreach($args as $key => $value) {
-			if( in_array($key, $valid_args) ) {
-				$method_args[$key] = $value;
-			}
-		}
-
-		return $method_args;
-	}
-
-	private function _auth() {
-		//checks if object has user & password, does not verify w/ Posterous
-		if (isset($this->user) && isset($this->pass) && $this->user != '' && $this->pass != '') {
-			return TRUE;
-		}
-		else {
-			return FALSE;
-		}
-	}
-
-	/* Getters & Setters */
-	function user($user = NULL) {
-		if ($user) {
-			$this->user = $user;
-		}
-		return $this->user;
-	}
-
-	function pass($pass = NULL) {
-		if ($pass) {
-			$this->pass = $pass;
-		}
-		return $this->pass;
-	}
-}
-
-?>
diff --git a/posterous/posterous.php b/posterous/posterous.php
index 25a009c51..eda2a93a4 100755
--- a/posterous/posterous.php
+++ b/posterous/posterous.php
@@ -153,9 +153,6 @@ function posterous_post_local(&$a,&$b) {
 
 function posterous_send(&$a,&$b) {
 
-	logger('posterous_send: invoked');
-	return;
-
     if($b['deleted'] || $b['private'] || ($b['created'] !== $b['edited']))
         return;