diff --git a/app/views/projects/_project.html.erb b/app/views/projects/_project.html.erb
index e6c1a7d2..c39e4ce0 100644
--- a/app/views/projects/_project.html.erb
+++ b/app/views/projects/_project.html.erb
@@ -21,6 +21,9 @@
       <li><%= link_to '<i class="fi-wrench"></i> '.html_safe + "Install", project.install_url, :target => '_blank' if project.install_url.present? %></li>
       <li><%= link_to '<i class="fi-page-edit"></i> '.html_safe + "Tasks", project.tasks_url, :target => '_blank' if project.tasks_url.present? %></li>
       <li><%= link_to '<i class="fi-comments"></i> '.html_safe + "Help", project.help_url, :target => '_blank' if project.help_url.present? %></li>
+      <li>
+        <%= render partial: 'project_social', locals: { project: project } %>
+      </li>
     </ul>
   </div>
 
diff --git a/app/views/projects/_project_social.html.erb b/app/views/projects/_project_social.html.erb
new file mode 100644
index 00000000..ebe4ce0f
--- /dev/null
+++ b/app/views/projects/_project_social.html.erb
@@ -0,0 +1,9 @@
+<% if project.twitter.present? %>
+  <a href="http://twitter.com/home?status=Check out the @<%= project.twitter %> project on @CodeMontage!" title="Share on Twitter" target="_blank" class="button radius small">
+    <i class="fi-social-twitter"></i> Share on Twitter
+  </a>
+<% elsif project.organization.twitter.present? %>
+  <a href="http://twitter.com/home?status=Check out @<%= project.organization.twitter %> on @CodeMontage!" title="Share on Twitter" target="_blank" class="button radius small">
+    <i class="fi-social-twitter"></i> Share on Twitter
+  </a>
+<% end %>
\ No newline at end of file
diff --git a/app/views/projects/show.html.erb b/app/views/projects/show.html.erb
index bdf1f4a0..5877f039 100644
--- a/app/views/projects/show.html.erb
+++ b/app/views/projects/show.html.erb
@@ -42,6 +42,10 @@
 
     <div class="large-4 columns">
       <%= link_to image_tag(find_logo(@project.organization), :alt => @project.organization.name), @project.organization.url, :target => '_blank' if find_logo?(@project.organization) %>
+      
+      <div id="social_share">
+        <%= render partial: 'project_social', locals: { project: @project } %>
+      </div>
 
       <div id="project_causes">
         <h5>Causes</h5>