diff --git a/config/initializers/load_config.rb b/config/initializers/load_config.rb
index 1b43709..f1e5dd2 100644
--- a/config/initializers/load_config.rb
+++ b/config/initializers/load_config.rb
@@ -1 +1,2 @@
-NOOSFERO_CONF = YAML.load_file("#{RAILS_ROOT}/config/noosfero.yml")[RAILS_ENV]
+file = "#{RAILS_ROOT}/config/noosfero.yml"
+NOOSFERO_CONF = File.exists?(file) ? YAML.load_file(file)[RAILS_ENV] || {} : {}
diff --git a/config/noosfero.yml b/config/noosfero.yml
deleted file mode 100644
index 9480bc6..0000000
--- a/config/noosfero.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-development: &DEVELOPMENT
-  mail_enabled: true
-  webmail_url: "http://localhost.localdomain/"
-  addthis_enabled: true
-  addthis_pub: your-user-name
-  addthis_logo: http://localhost:3000/images/logo-200x50.png
-  addthis_options: favorites, email, digg, delicious, technorati, slashdot, twitter, more
-  gravatar: wavatar
-  googlemaps_initial_zoom: 4
-
-test: &TEST
-  <<: *DEVELOPMENT
-
-production:
diff --git a/config/noosfero.yml.dist b/config/noosfero.yml.dist
new file mode 100644
index 0000000..4d5e657
--- /dev/null
+++ b/config/noosfero.yml.dist
@@ -0,0 +1,13 @@
+development:
+  mail_enabled: true
+  webmail_url: "http://localhost.localdomain/"
+  addthis_enabled: true
+  addthis_pub: your-user-name
+  addthis_logo: http://localhost:3000/images/logo-200x50.png
+  addthis_options: favorites, email, digg, delicious, technorati, slashdot, twitter, more
+  gravatar: wavatar
+  googlemaps_initial_zoom: 4
+
+test:
+
+production:
diff --git a/test/unit/load_config_test.rb b/test/unit/load_config_test.rb
index 27b6c4f..3baa48f 100644
--- a/test/unit/load_config_test.rb
+++ b/test/unit/load_config_test.rb
@@ -2,11 +2,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 
 class LoadConfigTest < Test::Unit::TestCase
 
-  should 'ensure YAML file exists' do
-    assert File.exists?("#{RAILS_ROOT}/config/noosfero.yml")
-  end
-
-  should 'ensure YAML file was loaded' do
+  should 'ensure NOOSFERO_CONF was defined' do
     assert NOOSFERO_CONF
     assert_kind_of Hash, NOOSFERO_CONF
   end
--
libgit2 0.21.2