diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb
new file mode 100644
index 000000000..abe26b804
--- /dev/null
+++ b/app/views/layouts/_footer.html.erb
@@ -0,0 +1,7 @@
+<ul>
+        <li><%= link_to "About", "https://github.com/Growstuff/project/wiki/About%20Growstuff" %></li>
+        <li><%= link_to "License", "https://github.com/Growstuff/growstuff/blob/dev/LICENSE.txt" %></li>
+        <li><%= link_to "Github", "https://github.com/Growstuff/" %></li>
+        <li><%= link_to "Mailing list", "http://lists.growstuff.org/mailman/listinfo/discuss" %></li>
+        <li><%= link_to "Community Guidelines", "https://github.com/Growstuff/policy/blob/master/community-guidelines.md" %></li>
+</ul>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index c39d207b7..35f0822de 100644
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -17,5 +17,7 @@
 
 <%= yield %>
 
+<%= render :partial => "layouts/footer" %>
+
 </body>
 </html>
diff --git a/spec/view/application_spec.rb b/spec/view/application_spec.rb
new file mode 100644
index 000000000..5e47ff8e3
--- /dev/null
+++ b/spec/view/application_spec.rb
@@ -0,0 +1,16 @@
+require 'spec_helper'
+
+describe 'layouts/application.html.erb', :type => "view" do
+    
+    before(:each) do
+      render
+    end
+
+    it 'should have links in footer' do
+        rendered.should contain 'About'
+        rendered.should contain 'License'
+        rendered.should contain 'Github'
+        rendered.should contain 'Mailing list'
+        rendered.should contain 'Community Guidelines'
+    end
+end
diff --git a/spec/view/index_spec.rb b/spec/view/index_spec.rb
index 4ab26969f..36a42629e 100644
--- a/spec/view/index_spec.rb
+++ b/spec/view/index_spec.rb
@@ -6,15 +6,14 @@ describe 'home/index.html.erb', :type => "view" do
     before(:each) do
       view.stub(:user_signed_in).and_return(false)
       view.stub(:current_user).and_return(nil)
+      render
     end
 
     it 'shows the homepage' do
-        render
         rendered.should contain 'Growstuff'
     end
 
     it 'should have signup/login links' do
-        render
         rendered.should contain 'Sign up'
         rendered.should contain 'Log in'
     end
@@ -33,16 +32,15 @@ describe 'home/index.html.erb', :type => "view" do
       @user = User.create(:email => "growstuff@example.com", :password => "irrelevant")
       @user.confirm!
       sign_in @user
+      render
     end
 
     it 'should show username' do
-      render
       rendered.should contain 'You are signed in as'
       rendered.should contain 'growstuff@example.com'
     end
 
     it 'should show logout link' do
-      render
       rendered.should contain 'Log out'
     end