diff --git a/lms/static/sass/course/wiki/_wiki.scss b/lms/static/sass/course/wiki/_wiki.scss
index 782792bbbb..bc2cc46700 100644
--- a/lms/static/sass/course/wiki/_wiki.scss
+++ b/lms/static/sass/course/wiki/_wiki.scss
@@ -466,6 +466,15 @@ section.wiki {
     }
   }
 
+  .accordion small {
+    font-size: 0.8em;
+    color: #aaa;
+  }
+
+  .accordion-toggle div {
+    margin-top: 8px;
+  }
+
   .collapse {
     display: none;
 
@@ -474,6 +483,28 @@ section.wiki {
     }
   }
 
+  .diff-container {
+    overflow-x: scroll;
+
+    table {
+      min-width: 100%;      
+    }
+
+    th {
+      font-family: $sans-serif;
+      font-size: 0.7em;
+    }
+
+    td {
+      font-family: $monospace;
+    }
+
+    .linenumber,
+    .data {
+      font-size: 0.75em;
+    }
+  }
+
 
 
 
diff --git a/lms/templates/wiki/includes/anonymous_blocked.html b/lms/templates/wiki/includes/anonymous_blocked.html
new file mode 100644
index 0000000000..264579130e
--- /dev/null
+++ b/lms/templates/wiki/includes/anonymous_blocked.html
@@ -0,0 +1,13 @@
+{% load i18n %}
+{% load url from future %}
+<em>
+{% url 'wiki:signup' as signup_url %}
+{% url 'wiki:login' as login_url %}
+{% if login_url and signup_url %}
+  {% blocktrans %}
+  You need to <a href="{{ login_url }}">log in</a> or <a href="{{ signup_url }}">sign up</a> to use this function.
+  {% endblocktrans %}
+{% else %}
+  {% trans "You need to log in or sign up to use this function." %}
+{% endif %}
+</em>
diff --git a/lms/templates/wiki/plugins/attachments/index.html b/lms/templates/wiki/plugins/attachments/index.html
new file mode 100644
index 0000000000..711f54a4af
--- /dev/null
+++ b/lms/templates/wiki/plugins/attachments/index.html
@@ -0,0 +1,132 @@
+{% extends "wiki/article.html" %}
+{% load wiki_tags i18n humanize %}
+{% load url from future %}
+
+{% block pagetitle %}{% trans "Attachments" %}: {{ article.current_revision.title }}{% endblock %}
+
+{% block wiki_contents_tab %}
+<div class="row-fluid">
+
+
+
+  {% if article|can_write:user %}
+  <div class="span5" style="min-width: 330px;">
+    <div class="accordion" id="accordion_upload">
+      <div class="accordion-group">        
+        <div class="accordion-heading">
+          <a class="accordion-toggle btn" href="#collapse_upload" data-toggle="collapse">
+            <span class="icon-upload"></span>{% trans "Upload new file" %} 
+          </a>
+        </div>        
+        <div id="collapse_upload" class="accordion-body collapse{% if form.errors %} in{% endif %}">
+          <div class="accordion-inner">
+            {% if anonymous_disallowed %}
+              {% include "wiki/includes/anonymous_blocked.html" %}
+            {% else %}
+            <form method="POST" class="form-vertical" id="attachment_form" enctype="multipart/form-data">
+              {% wiki_form form %}
+              <button type="submit" name="save" value="1" class="btn btn-large">
+                {% trans "Upload file" %}
+              </button>
+            </form>
+            {% endif %}
+          </div>
+        </div>
+      
+      </div>
+    </div>
+    <div class="accordion" id="accordion_add">
+      <div class="accordion-group">
+        <div class="accordion-heading">
+          <a class="accordion-toggle btn" href="#collapse_add" data-toggle="collapse">
+            <span class="icon-plus-sign"></span>{% trans "Search and add file" %}
+          </a>
+        </div>
+        
+        <div id="collapse_add" class="accordion-body collapse">
+          <div class="accordion-inner">
+            <p>{% trans "You can reuse files from other articles. These files are subject to updates on other articles which may or may not be a good thing." %}</p>
+            <form method="GET" action="{% url 'wiki:attachments_search' path=urlpath.path article_id=article.id %}" class="form-search">
+              {{ search_form.query }}
+              <button class="btn btn-large">
+                {% trans "Search files and articles" %}
+              </button>
+            </form>
+          </div>
+        </div>
+      </div>
+      
+    </div>
+  </div>
+  {% endif %}
+
+
+
+  <div class="span7">
+    <p class="lead">{% trans "The following files are available for this article. Copy the markdown tag to directly refer to a file from the article text." %}</p>
+    {% for attachment in attachments %}
+      <table class="table table-bordered table-striped" style="width: 100%;">
+      <tr>
+        <td colspan="4">
+          <h3>
+            <a href="{% url 'wiki:attachments_download' path=urlpath.path article_id=article.id attachment_id=attachment.id %}">{{ attachment.current_revision.get_filename }}</a>
+            <span class="badge">{{ attachment.current_revision.created|naturaltime }}</span>
+            {% if attachment.current_revision.deleted %}
+            <span class="badge badge-important">{% trans "deleted" %}</span>
+            {% endif %}
+          </h3>
+          {{ attachment.current_revision.description }}
+        </td>
+      </tr>
+      <tr>
+        <th>{% trans "Markdown tag" %}</th>
+        <th>{% trans "Uploaded by" %}</th>
+        <th>{% trans "Size" %}</th>
+        <td style="text-align: right;" rowspan="2">
+          {% if attachment|can_write:user %}
+            <p>
+            {% if not attachment.current_revision.deleted %}
+              <a href="{% url 'wiki:attachments_replace' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Replace" %}</a>
+              {% if attachment.article = article %}
+                <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Delete" %}</a>
+              {% else %}
+                <a href="{% url 'wiki:attachments_delete' path=urlpath.path article_id=article.id attachment_id=attachment.id %}" class="btn">{% trans "Detach" %}</a>
+              {% endif %}
+            {% else %}
+              {% if attachment.current_revision.previous_revision.id %}
+              <form method="POST" action="{% url 'wiki:attachments_revision_change' path=urlpath.path article_id=article.id attachment_id=attachment.id revision_id=attachment.current_revision.previous_revision.id %}">
+                {% csrf_token %}
+                <button class="btn">
+                  {% trans "Restore" %}
+                </button>
+              </form>
+              {% endif %}
+            {% endif %}
+            </p>
+          {% endif %}
+          <p>
+          <a href="{% url 'wiki:attachments_history' path=urlpath.path article_id=article.id attachment_id=attachment.id %}">
+            <span class="icon-time"></span>
+            {% trans "File history" %} ({{ attachment.attachmentrevision_set.all.count }} {% trans "revisions" %})
+          </a>
+          </p>
+        </td>
+      </tr>
+      <tr>
+        <td><code>[attachment:{{ attachment.id }}]</code></td>
+        <td>
+        {% if attachment.current_revision.user %}{{ attachment.current_revision.user }}{% else %}{% if user|is_moderator %}{{ attachment.current_revision.ip_address|default:"anonymous (IP not logged)" }}{% else %}{% trans "anonymous (IP logged)" %}{% endif %}{% endif %}
+        </td>
+        <td>{{ attachment.current_revision.get_size|filesizeformat }}</td>
+      </tr>
+      </table>
+    {% empty %}
+      <p style="margin-bottom: 20px;"><em>{% trans "There are no attachments for this article." %}</em></p>
+    {% endfor %}
+  </div>
+  
+  
+</div>
+  
+{% endblock %}
+