diff --git a/res/drawable/icon_story_maker.png b/res/drawable/icon_story_maker.png
new file mode 100755
index 00000000..9c54ca56
Binary files /dev/null and b/res/drawable/icon_story_maker.png differ
diff --git a/res/layout/layout_wizard_tips.xml b/res/layout/layout_wizard_tips.xml
index 5129935b..992dfd10 100644
--- a/res/layout/layout_wizard_tips.xml
+++ b/res/layout/layout_wizard_tips.xml
@@ -34,7 +34,7 @@
         android:textColor="#ffffff"
         android:textSize="8pt" >
     </TextView>
-
+    
     <Button
         android:id="@+id/WizardRootButtonInstallOrweb"
         android:layout_width="fill_parent"
@@ -81,6 +81,15 @@
         android:drawableLeft="@drawable/ic_twitter"
         android:text="@string/wizard_tips_twitter" />
     
+    <Button
+        android:id="@+id/WizardRootButtonInstallStoryMaker"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        android:layout_gravity="left"
+        android:layout_marginTop="10px"
+        android:drawableLeft="@drawable/icon_story_maker"
+        android:text="@string/wizard_tips_story_maker" />
+    
     <!-- 
      <Button
         android:id="@+id/WizardRootButtonGooglePlay"
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 6deceaf1..2a6725a4 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -80,6 +80,8 @@
   <string name="wizard_tips_firefox">Proxy Mobile add-on for Firefox (http://tinyurl.com/getproxymob)</string>
   <string name="proxymob_setup_url">https://guardianproject.info/releases/proxymob-latest.xpi</string>
   <string name="wizard_tips_twitter">Set Twitter proxy to host \"localhost\" and port 8118</string>
+  <string name="wizard_tips_story_maker">StoryMaker - Make a story and leave it to tor for security!</string>
+  <string name="story_maker_url">https://play.google.com/store/apps/details?id=info.guardianproject.mrapp</string>
   <string name="twitter_setup_url">https://guardianproject.info/2012/05/02/orbot-your-twitter/</string>
   <string name="wizard_proxy_help_info">Proxy Settings</string>
   <string name="wizard_proxy_help_msg">If the Android app you are using can support the use of an HTTP or SOCKS proxy, then you can configure it to connect to Orbot and use Tor.\n\n\n    The host settings is 127.0.0.1 or \"localhost\". For HTTP, the port setting is 8118. For SOCKS, the proxy is 9050. You should use SOCKS4A or SOCKS5 if possible.\n    \n\n\n    You can learn more about proxying on Android via the FAQ at: http://tinyurl.com/proxyandroid\n    </string>
diff --git a/src/org/torproject/android/wizard/TipsAndTricks.java b/src/org/torproject/android/wizard/TipsAndTricks.java
index 5d0872cd..300730b7 100644
--- a/src/org/torproject/android/wizard/TipsAndTricks.java
+++ b/src/org/torproject/android/wizard/TipsAndTricks.java
@@ -127,6 +127,18 @@ public class TipsAndTricks extends Activity implements TorConstants {
 			}
 		});
         
+        btnLink = (Button)findViewById(R.id.WizardRootButtonInstallStoryMaker);
+
+        btnLink.setOnClickListener(new OnClickListener() {
+			
+			public void onClick(View view) {
+				
+				String url = getString(R.string.story_maker_url);
+				startActivity(new Intent(Intent.ACTION_VIEW, Uri.parse(url)));
+
+			}
+		});
+        
         /**
         btnLink = (Button)findViewById(R.id.WizardRootButtonGooglePlay);