diff --git a/app/views/admin_panel/site_info.rhtml b/app/views/admin_panel/site_info.rhtml
index bae348a..957dfa8 100644
--- a/app/views/admin_panel/site_info.rhtml
+++ b/app/views/admin_panel/site_info.rhtml
@@ -6,6 +6,8 @@
 
 <% labelled_form_for :environment, @environment do |f| %>
 
+  <%= labelled_form_field(_('Site name'), f.text_field(:name)) %>
+
   <%= labelled_form_field _('Homepage content'), text_area(:environment, :description, :cols => 40, :style => 'width: 90%') %>
 
   <% button_bar do %>
diff --git a/features/environment_name.feature b/features/environment_name.feature
new file mode 100644
index 0000000..63c96d3
--- /dev/null
+++ b/features/environment_name.feature
@@ -0,0 +1,12 @@
+Feature: setting environment name
+  As an environment administrator
+  I want to change the name of the environment
+  So that it appears in the window's title bar
+
+  Scenario: setting environment name through administration panel
+    Given I am logged in as admin
+    When I follow "Administration"
+    And I follow "Edit site info"
+    And I fill in "Name" with "My environment"
+    And I press "Save"
+    Then I should see "My environment" within "title"
--
libgit2 0.21.2