diff --git a/app/controllers/admin/admin_panel_controller.rb b/app/controllers/admin/admin_panel_controller.rb
index 0281196..2cde1da 100644
--- a/app/controllers/admin/admin_panel_controller.rb
+++ b/app/controllers/admin/admin_panel_controller.rb
@@ -12,6 +12,14 @@ class AdminPanelController < AdminController
     environment
   end
 
+  def site_info
+    if request.post?
+      if @environment.update_attributes(params[:environment])
+        redirect_to :action => 'index'
+      end
+    end
+  end
+
   protected
 
   def load_default_enviroment
diff --git a/app/views/admin_panel/index.rhtml b/app/views/admin_panel/index.rhtml
index 2030d51..b9a0d75 100644
--- a/app/views/admin_panel/index.rhtml
+++ b/app/views/admin_panel/index.rhtml
@@ -3,6 +3,7 @@
 <p><%= _('You, as an environment administrator, has the following options:')%></p>
 
 <ul>
+  <li><%= link_to _('Edit site info'), :action => 'site_info' %></li>
   <li><%= link_to _('Enable/disable features'), :controller => 'features' %></li>
   <li><%= link_to _('Edit the Visual Design'), :controller => 'edit_template'%></li>
   <li><%= link_to _('Manage Categories'), :controller => 'categories'%></li>
diff --git a/app/views/admin_panel/site_info.rhtml b/app/views/admin_panel/site_info.rhtml
new file mode 100644
index 0000000..54db9d2
--- /dev/null
+++ b/app/views/admin_panel/site_info.rhtml
@@ -0,0 +1,14 @@
+<h2><%= _('Site info') %></h2>
+
+<%= render :file => 'shared/tiny_mce' %>
+
+<% labelled_form_for :environment, @environment do |f| %>
+
+  <%= f.text_area :description %>
+
+  <% button_bar do %>
+    <%= submit_button(:save, _('Save')) %>
+    <%= button(:cancel, _('Cancel'), :action => 'index') %>
+  <% end %>
+
+<% end %>
diff --git a/app/views/home/index.rhtml b/app/views/home/index.rhtml
index 7f0a13a..3cb8011 100644
--- a/app/views/home/index.rhtml
+++ b/app/views/home/index.rhtml
@@ -1,12 +1,3 @@
 <%= flash[:notice] %>
 
-<h1><%= @environment.name %></h1>
-
-<h2><%= _('Recent articles') %></h2>
-
-<% for article in @articles %>
-  <h2><%= article.name %></h2>
-  <div>
-    <%= article.to_html %>
-  </div>
-<% end %>
+<%= @environment.description %>
diff --git a/test/functional/admin_panel_controller_test.rb b/test/functional/admin_panel_controller_test.rb
index 224975d..f53bafc 100644
--- a/test/functional/admin_panel_controller_test.rb
+++ b/test/functional/admin_panel_controller_test.rb
@@ -17,10 +17,26 @@ class AdminPanelControllerTest < Test::Unit::TestCase
   def test_index
     get :index
     assert_template 'index'
+    assert_tag :tag => 'a', :attributes => { :href => /site_info/ }
     assert_tag :tag => 'a', :attributes => { :href => /categories/ }
     assert_tag :tag => 'a', :attributes => { :href => /edit_template/ }
     assert_tag :tag => 'a', :attributes => { :href => /features/ }
     assert_tag :tag => 'a', :attributes => { :href => /role/ }
     assert_tag :tag => 'a', :attributes => { :href => /region_validators/ }
   end
+  
+  should 'display form for editing site info' do
+    get :site_info
+    assert_template 'site_info'
+    assert_tag :tag => 'textarea', :attributes => { :name => 'environment[description]'}
+  end
+
+  should 'save site description' do
+
+    post :site_info, :environment => { :description => "This is my new environment" }
+    assert_redirected_to :action => 'index'
+
+    assert_equal "This is my new environment", Environment.default.description
+  end
+
 end
--
libgit2 0.21.2