diff --git a/app/views/home/home.html.haml b/app/views/home/home.html.haml
new file mode 100644
index 00000000000..201ed2d0c8f
--- /dev/null
+++ b/app/views/home/home.html.haml
@@ -0,0 +1,18 @@
+-#   Copyright (c) 2010-2011, University of Konstanz  This file is
+-#   licensed under the Affero General Public License version 3 or later.  See
+-#   the COPYRIGHT file.
+
+
+- content_for :page_title do
+  = pod_name
+
+#section_header
+  %h2
+    = t('welcome')
+
+.container{:style => 'text-align:center;'}
+    %p
+      %b=t('uniknintro')
+    %br
+    %br
+      %a{:id='login-link', :href='login', :class='btn', :style='margin-right: 15px;'} Log In
diff --git a/app/views/home/show.mobile.haml b/app/views/home/show.mobile.haml
index 86b60f6a541..d3bd14c1568 100644
--- a/app/views/home/show.mobile.haml
+++ b/app/views/home/show.mobile.haml
@@ -3,4 +3,4 @@
 -#   the COPYRIGHT file.
 
 
-=render :partial => 'home/show' rescue  "put something in app/views/home/_show.html"
+=render :partial => 'home/show'
diff --git a/config/locales/diaspora/de.yml b/config/locales/diaspora/de.yml
index f2e3daf9f7b..9eaf88cedda 100644
--- a/config/locales/diaspora/de.yml
+++ b/config/locales/diaspora/de.yml
@@ -1054,6 +1054,7 @@ de:
     not_enabled: "Webfinger scheint nicht für den Server von %{account} verfügbar zu sein."
     xrd_fetch_failed: "Die XRD-Datei von %{account} konnte nicht heruntergeladen werden."
   welcome: "Willkommen!"
+  uniknintro: "Dieser Pod ist momentan im ALPHA-status was bedeuted dass diese Platform nur für Testzwecke dient. Konkret heisst das: Alle Daten können jederzeit gelöscht werden und die Verfügbarkeit ist nicht garantiert!"
   will_paginate:
     next_label: "nächstes »"
     previous_label: "« voriges"
\ No newline at end of file
diff --git a/config/locales/diaspora/en.yml b/config/locales/diaspora/en.yml
index 8bb17197156..76e783430a0 100644
--- a/config/locales/diaspora/en.yml
+++ b/config/locales/diaspora/en.yml
@@ -44,6 +44,8 @@ en:
   no_results: "No Results Found"
   _contacts: "Contacts"
   welcome: "Welcome!"
+  uniknintro: "This Pod is currently ALPHA-status only which means that this platform is for testing only. More concise: Any data may be deleted at any time as well as the availability may not be guaranteed!"
+  
 
   #for reference translation, the real activerecord english transations are actually
   #in en-US, en-GB, and en-AU yml files
diff --git a/config/routes.rb b/config/routes.rb
index 89f2e91d21d..3a3c02f69fa 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -216,5 +216,5 @@
   end
 
   # Startpage
-  root :to => 'home#show'
+  root :to => 'home#home'
 end