diff --git a/app/views/shared/_donate.html.haml b/app/views/shared/_donate.html.haml
deleted file mode 100644
index 38a04b6a6..000000000
--- a/app/views/shared/_donate.html.haml
+++ /dev/null
@@ -1,11 +0,0 @@
-%form{:action => "https://www.paypal.com/cgi-bin/webscr", :method => "post"}
-  %input{:name => "cmd", :type => "hidden", :value => "_s-xclick"}
-  %input{:name => "hosted_button_id", :type => "hidden", :value => AppConfig[:paypal_hosted_button_id]}
-  %input{:name => "on0", :type => "hidden", :value => "Type"}
-  %input{:name => "modify", :type => "hidden", :value => "2"}
-  %select{:name => "os0"}
-    %option{:value => "Mocha"} Mocha : $3.00USD
-    %option{:value => "Americano"} Americano : $5.00USD
-    %option{:value => "Box o' Joe"} Box o' Joe : $20.00USD
-  %input{:name => "currency_code", :type => "hidden", :value => "USD"}
-  %input{:name => "submit", :type => "submit", :value => t('aspects.index.donate')}
diff --git a/app/views/shared/_right_sections.html.haml b/app/views/shared/_right_sections.html.haml
index a8dab6be4..dc550ffa9 100644
--- a/app/views/shared/_right_sections.html.haml
+++ b/app/views/shared/_right_sections.html.haml
@@ -76,14 +76,17 @@
   .content
     != t('bookmarklet.explanation', :link => link_to(t('bookmarklet.explanation_link_text'), bookmarklet))
 
-- if AppConfig[:paypal_hosted_button_id].present?
-  .section
-    .title
-      = image_tag('icons/coffee.png')
-      %h5
-        = t('aspects.index.donate')
-    .content
-      = t('aspects.index.keep_us_running', :pod => URI.parse(AppConfig[:pod_url]).host)
+.section
+  .title
+    = image_tag('icons/coffee.png')
+    %h5
+      = t('aspects.index.donate')
+  .content
+    - if AppConfig[:paypal_hosted_button_id].present?
+      = t('aspects.index.keep_pod_running', :pod => URI.parse(AppConfig[:pod_url]).host)
       %br
-      = render 'shared/donate'
-
+      = render 'shared/donatepod'
+    - else
+      = t('aspects.index.keep_diaspora_running')
+      %br
+      = render 'shared/donatediaspora'
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 975f575cc..eb0e43dc2 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -167,7 +167,8 @@ en:
       friends: "Friends"
     index:
       donate: "Donate"
-      keep_us_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
+      keep_pod_running: "Keep %{pod} running fast and buy servers their coffee fix with a monthly donation!"
+      keep_diaspora_running: "Keep Diaspora development fast with a monthly donation!"
       no_tags: "+ Find a tag to follow"
       unfollow_tag: "Stop following #%{tag}"
       handle_explanation: "This is your Diaspora ID. Like an email address, you can give this to people to reach you."