--- a/app/models/mailer.rb
+++ b/app/models/mailer.rb
@@ -2,7 +2,7 @@ class Mailer < ActionMailer::Base
   def signup_notification(user)
     setup_email(user)
     @subject    += 'Please activate your new account'
-    @body[:url]  = "http://GitoriousConfig['gitorious_host']/users/activate/#{user.activation_code}"
+    @body[:url]  = "http://#{GitoriousConfig['gitorious_host']}/users/activate/#{user.activation_code}"
   
   end
   
@@ -18,7 +18,7 @@ class Mailer < ActionMailer::Base
     @body[:cloner] = repository.user
     @body[:project] = repository.project
     @body[:repository] = repository
-    @body[:url] = "http://GitoriousConfig['gitorious_host']/p/#{repository.project.slug}/repos/#{repository.name}"
+    @body[:url] = "http://#{GitoriousConfig['gitorious_host']}/p/#{repository.project.slug}/repos/#{repository.name}"
   end
   
   def merge_request_notification(merge_request)
@@ -26,7 +26,7 @@ class Mailer < ActionMailer::Base
     @subject += %Q{#{merge_request.source_repository.user.login} has requested a merge in #{merge_request.target_repository.project.title}}
     @body[:merge_request] = merge_request
     @body[:project] = merge_request.target_repository.project
-    url = "http://GitoriousConfig['gitorious_host']/p/#{merge_request.target_repository.project.slug}"
+    url = "http://#{GitoriousConfig['gitorious_host']}/p/#{merge_request.target_repository.project.slug}"
     url << "/repos/#{merge_request.target_repository.name}"
     url << "/merge_requests/#{merge_request.id}"
     @body[:url] = url
@@ -35,7 +35,7 @@ class Mailer < ActionMailer::Base
   protected
     def setup_email(user)
       @recipients  = "#{user.email}"
-      @from        = "Gitorious <no-reply@GitoriousConfig['gitorious_host']>"
+      @from        = "Gitorious <no-reply@#{GitoriousConfig['gitorious_host']}>"
       @subject     = "[Gitorious] "
       @sent_on     = Time.now
       @body[:user] = user

--- a/app/views/browse/index.atom.builder
+++ b/app/views/browse/index.atom.builder
@@ -3,7 +3,7 @@ atom_feed do |feed|
   feed.updated((@commits.blank? ? nil : @commits.first.committed_date))
 
   @commits.each do |commit|
-    item_url = "http://GitoriousConfig['gitorious_host']" +  project_repository_commit_path(@project, @repository, commit.id)
+    item_url = "http://#{GitoriousConfig['gitorious_host']}" +  project_repository_commit_path(@project, @repository, commit.id)
     feed.entry(commit.id, {
       :url => item_url, 
       :updated => commit.committed_date, 

--- a/app/views/comments/index.atom.builder
+++ b/app/views/comments/index.atom.builder
@@ -3,7 +3,7 @@ atom_feed do |feed|
   feed.updated((@comments.blank? ? Time.now : @comments.first.created_at))
 
   @comments.each do |comment|
-    item_url = "http://GitoriousConfig['gitorious_host']" + project_repository_comments_path(@project,@repository)
+    item_url = "http://#{GitoriousConfig['gitorious_host']}" + project_repository_comments_path(@project,@repository)
     feed.entry(comment, :url => item_url) do |entry|
       entry.title("#{comment.user.login}: #{truncate(comment.body, 30)}")
       entry.content(comment.body)

--- a/app/views/mailer/activation.rhtml
+++ b/app/views/mailer/activation.rhtml
@@ -1,8 +1,8 @@
 Hello <%= @user.login %>, 
 
-your account has been activated.  You can add your public SSH key here http://GitoriousConfig['gitorious_host']/account as well as change your details.
+your account has been activated.  You can add your public SSH key here http://<%= GitoriousConfig['gitorious_host'] -%>/account as well as change your details.
 
 Thank you
 
-http://GitoriousConfig['gitorious_host']
+http://<%= GitoriousConfig['gitorious_host'] %>
 

--- a/app/views/mailer/merge_request_notification.rhtml
+++ b/app/views/mailer/merge_request_notification.rhtml
@@ -13,4 +13,4 @@ You can review the request and its commits here:
 
 Thank you
 
-http://GitoriousConfig['gitorious_host']
+http://<%= GitoriousConfig['gitorious_host'] %>

--- a/app/views/mailer/new_repository_clone.rhtml
+++ b/app/views/mailer/new_repository_clone.rhtml
@@ -6,4 +6,4 @@ Hello <%= @user.login -%>,
 
 Thank you
 
-http://GitoriousConfig['gitorious_host']
\ No newline at end of file
+http://<%= GitoriousConfig['gitorious_host'] %>
\ No newline at end of file

--- a/app/views/mailer/signup_notification.rhtml
+++ b/app/views/mailer/signup_notification.rhtml
@@ -1,6 +1,6 @@
 Hello,
 
-Your GitoriousConfig['gitorious_host'] account has been created, your username is <%= @user.login %>
+Your <%= GitoriousConfig['gitorious_host'] -%> account has been created, your username is <%= @user.login %>
 
 Please visit this url to activate your account:
 
@@ -9,4 +9,4 @@ Please visit this url to activate your account:
 
 Thank you
 
-http://GitoriousConfig['gitorious_host']
\ No newline at end of file
+http://<%= GitoriousConfig['gitorious_host'] %>
\ No newline at end of file

--- a/app/views/projects/index.atom.builder
+++ b/app/views/projects/index.atom.builder
@@ -3,7 +3,7 @@ atom_feed do |feed|
   feed.updated((@projects.blank? ? Time.now : @projects.first.created_at))
 
   @projects.each do |project|
-    item_url = "http://GitoriousConfig['gitorious_host']" + project_path(project)
+    item_url = "http://#{GitoriousConfig['gitorious_host']}" + project_path(project)
     feed.entry(project, :url => item_url) do |entry|
       entry.title(project.title)
       entry.content(project.description)

--- a/app/views/site/faq.html.erb
+++ b/app/views/site/faq.html.erb
@@ -15,7 +15,7 @@
   file of the repository you wish to push:
 <pre>
 [remote "origin"]
-       url = git@GitoriousConfig['gitorious_host']:<em>project</em>/<em>repository.git</em>
+       url = git@<%= GitoriousConfig['gitorious_host'] -%>:<em>project</em>/<em>repository.git</em>
        fetch = +refs/heads/*:refs/remotes/origin/*
 [branch "master"]
        remote = origin
@@ -24,11 +24,11 @@
   and then <code>git push origin master</code> to push the code to Gitorious.
 </p>
 <p>
-  You can also just run "<code>git push git@GitoriousConfig['gitorious_host']:tumbline/mainline.git</code>", or 
+  You can also just run "<code>git push git@<%= GitoriousConfig['gitorious_host'] -%>:tumbline/mainline.git</code>", or 
   you can setup a remote by doing the following (add --fetch to the add call to 
   get the config from above):
   <pre>
-  git remote add origin git@GitoriousConfig['gitorious_host']:<em>project</em>/<em>repository.git</em>
+  git remote add origin git@<%= GitoriousConfig['gitorious_host'] -%>:<em>project</em>/<em>repository.git</em>
   # to push the master branch to the origin remote we added above:
   git push origin master 
   # after that you can just do:
@@ -44,7 +44,7 @@
   can contact you about your projects if they need to. We do however take light 
   measures against crawlers by not displaying your email in completely plain text. <br />
   But just to be clear: we won't sell or use any information you give to 
-  GitoriousConfig['gitorious_host'] against you or anyone else for financial and/or personal gains.
+  <%= GitoriousConfig['gitorious_host'] -%> against you or anyone else for financial and/or personal gains.
 </p>
 
 <hr />

--- a/config/gitorious.sample.yml
+++ b/config/gitorious.sample.yml
@@ -17,5 +17,5 @@ gitorious_client_port: 3000
 # Host the ./script/gitorious script should use:
 gitorious_client_host: localhost
 
-# Host which is serving the gitorious app
-gitorious_host: GitoriousConfig['gitorious_host']
+# Host which is serving the gitorious app, eg "gitorious.org"
+gitorious_host: gitorious.org