diff --git a/tumblr/README b/tumblr/README
index 62d7fd045..9b77bdcde 100644
--- a/tumblr/README
+++ b/tumblr/README
@@ -1,9 +1,7 @@
-Define in your .htconfig.php:
-$a->config['tumblr']['consumer_key'] = "your-consumer-key";
-$a->config['tumblr']['consumer_secret'] = "your-consumer-secret";
-
-You can get it here:
+Register an application at this address:
 http://www.tumblr.com/oauth/apps
 
+use (your server name)addon/tumblr/callback.php as callback URL
+
 Tumblr-OAuth-Library:
 https://groups.google.com/d/msg/tumblr-api/g6SeIBWvsnE/gnWqT9jFSlEJ
diff --git a/tumblr/templates/admin.tpl b/tumblr/templates/admin.tpl
new file mode 100644
index 000000000..b361f182f
--- /dev/null
+++ b/tumblr/templates/admin.tpl
@@ -0,0 +1,3 @@
+{{include file="field_input.tpl" field=$consumer_key}}
+{{include file="field_input.tpl" field=$consumer_secret}}
+<div class="submit"><input type="submit" name="page_site" value="{{$submit}}" /></div>
diff --git a/tumblr/tumblr.php b/tumblr/tumblr.php
index cd9713cf8..619ff16e8 100644
--- a/tumblr/tumblr.php
+++ b/tumblr/tumblr.php
@@ -54,6 +54,25 @@ function tumblr_content(&$a) {
 	return $o;
 }
 
+function tumblr_plugin_admin(&$a, &$o){
+        $t = get_markup_template( "admin.tpl", "addon/tumblr/" );
+
+        $o = replace_macros($t, array(
+                '$submit' => t('Save Settings'),
+                                                                // name, label, value, help, [extra values]
+                '$consumer_key' => array('consumer_key', t('Consumer Key'),  get_config('tumblr', 'consumer_key' ), ''),
+                '$consumer_secret' => array('consumer_secret', t('Consumer Secret'),  get_config('tumblr', 'consumer_secret' ), ''),
+        ));
+}
+
+function tumblr_plugin_admin_post(&$a){
+        $consumer_key     =       ((x($_POST,'consumer_key'))              ? notags(trim($_POST['consumer_key']))   : '');
+        $consumer_secret =       ((x($_POST,'consumer_secret'))   ? notags(trim($_POST['consumer_secret'])): '');
+        set_config('tumblr','consumer_key',$consumer_key);
+        set_config('tumblr','consumer_secret',$consumer_secret);
+        info( t('Settings updated.'). EOL );
+}
+
 function tumblr_connect($a) {
 	// Start a session.  This is necessary to hold on to  a few keys the callback script will also need
 	session_start();