diff --git a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/custom_subtitles.html b/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/custom_subtitles.html
new file mode 100644
index 00000000..177ae728
--- /dev/null
+++ b/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/custom_subtitles.html
@@ -0,0 +1,43 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{% extends "mediagoblin/base.html" %}
+
+{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block title -%}
+{%- endblock %}
+
+
+{% block mediagoblin_content %}
+<link href="{{
+          request.staticdirect('/css/subtitles.css') }}"
+        rel="stylesheet">
+
+  <form action="{{ request.urlgen('mediagoblin.plugins.custom_subtitles.customize',
+                            user=media.get_actor.username,
+                            media_id=media.id,
+                            path=path) }}" method="POST" enctype="multipart/form-data">
+    <div class="form_box edit_box">
+      {{ wtforms_util.render_divs(form) }}
+      <div class="form_submit_buttons">
+        <input type="submit" value="{% trans %}Save changes{% endtrans %}" class="button_form" />
+	{{ csrf_token }}
+      </div>
+    </div>
+  </form>
+{% endblock %} 
diff --git a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitle_media_block.html b/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitle_media_block.html
new file mode 100644
index 00000000..3e6bf886
--- /dev/null
+++ b/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitle_media_block.html
@@ -0,0 +1,50 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+
+{% block subtitle_block %}
+{% if "video.html" in media.media_manager.display_template or "audio.html" in media.media_manager.display_template %}
+      {%- if media.subtitle_files|count %}
+        <h3>{% trans %}Subtitles{% endtrans %}</h3>
+        <ul>
+          {%- for subtitle in media.subtitle_files %}
+            <li>
+                <a href="{{ request.urlgen('mediagoblin.plugins.custom_subtitles.customize',
+                            user=media.get_actor.username,
+                            media_id=media.id,
+                            path=subtitle.filepath) }}">
+                {{- subtitle.name -}}
+            </li>
+          {%- endfor %}
+        </ul>
+      {%- endif %}
+      {%- if request.user
+            and (media.actor == request.user.id
+                 or request.user.has_privilege('admin')) %}
+        {%- if not media.subtitle_files|count %}
+          <h3>{% trans %}Subtitles{% endtrans %}</h3>
+        {%- endif %}
+        <p>
+          <a href="{{ request.urlgen('mediagoblin.plugins.custom_subtitles.subtitles',
+                        user=media.get_actor.username,
+                        media_id=media.id) }}">
+            {%- trans %}Add subtitle {% endtrans -%}
+          </a>
+        </p>
+      {%- endif %}
+    {% endif %}
+{% endblock %}
diff --git a/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitles.html b/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitles.html
new file mode 100644
index 00000000..daf05c11
--- /dev/null
+++ b/mediagoblin/plugins/custom_subtitles/templates/mediagoblin/plugins/custom_subtitles/subtitles.html
@@ -0,0 +1,69 @@
+{#
+# GNU MediaGoblin -- federated, autonomous media hosting
+# Copyright (C) 2011, 2012 MediaGoblin contributors.  See AUTHORS.
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#}
+{%- extends "mediagoblin/base.html" %}
+
+{% import "/mediagoblin/utils/wtforms.html" as wtforms_util %}
+
+{% block title -%}
+  {% trans media_title=media.title -%}
+      Editing subtitles for {{ media_title }}
+  {%- endtrans %} &mdash; {{ super() }}
+{%- endblock %}
+
+{% block mediagoblin_content %}
+  <form action="{{ request.urlgen('mediagoblin.plugins.custom_subtitles.subtitles',
+                               user= media.get_actor.username,
+                               media_id=media.id) }}"
+        method="POST" enctype="multipart/form-data">
+    <div class="form_box">
+      <h1>
+        {%- trans media_title=media.title -%}
+          Editing subtitles for {{ media_title }}
+        {%- endtrans -%}
+      </h1>
+      <div style="text-align: center;" >
+        <img src="{{ media.thumb_url }}" />
+      </div>
+
+      {% if media.subtitle_files|count %}
+      <h2>{% trans %}subtitles{% endtrans %}</h2>
+      <ul>
+	{%- for subtitle in media.subtitle_files %}
+          <li>
+	    <a target="_blank" href="{{ request.app.public_store.file_url(
+				     subtitle['filepath']) }}">
+	      {{- subtitle.name -}}
+	    </a>
+	  </li>
+	{%- endfor %}
+      </ul>
+      {% endif %}
+
+      <h2>{% trans %}Add subtitle{% endtrans %}</h2>
+      {{- wtforms_util.render_divs(form) }}
+      <div class="form_submit_buttons">
+        <a class="button_action" href="{{ media.url_for_self(request.urlgen) }}">
+          {%- trans %}Cancel{% endtrans -%}
+        </a>
+        <input type="submit" value="{% trans %}Save changes{% endtrans %}"
+               class="button_form" />
+	{{ csrf_token }}
+      </div>
+    </div>
+  </form>
+{% endblock %}