diff --git a/ietf/static/ietf/js/document_timeline.js b/ietf/static/ietf/js/document_timeline.js
index 8f5a6461c..746de3abf 100644
--- a/ietf/static/ietf/js/document_timeline.js
+++ b/ietf/static/ietf/js/document_timeline.js
@@ -36,9 +36,15 @@ function bar_width(d, i) {
         if (data[i].name === d.name || data[i].name.match(/^rfc/)) { break; }
     }
 
-    var w = i === data.length ? expiration_date(d) : data[i].published;
-    // don't extend the bar past the expiration date of the document
-    w = w > expiration_date(d) ? expiration_date(d) : w;
+    var w;
+    if (d.name.match(/^draft-/)) {
+        // don't extend the bar past the expiration date of the document
+        w = i === data.length ? expiration_date(d) : data[i].published;
+        w = w > expiration_date(d) ? expiration_date(d) : w;
+    } else {
+        // documents other than drafts don't expire after 185 days
+        w = i === data.length ? new Date() : data[i].published;
+    }
     return x_scale(w) - x_scale(d.published);
 }
 
@@ -58,12 +64,17 @@ function scale_x() {
     now = Date.now();
     if (tv[tv.length - 1].published > now) { tv.push(new Date(now)); }
 
+    // x label format
+    var format = d3.time.format("%b %Y");
+
     // resort data by publication time to suppress some ticks if they are closer
-    // than 12px, and don't add a tick for the final pseudo entry
+    // than 12px and have a different label from the one before; and don't add a
+    // tick for the final pseudo entry
     tv = tv.sort(function(a, b) { return a.published - b.published; })
         .map(function(d, i, arr) {
             if (i === 0 ||
-                x_scale(d.published) > x_scale(arr[i - 1].published) + 12) {
+                x_scale(d.published) > x_scale(arr[i - 1].published) + 12 &&
+                format(d.published) !== format(arr[i - 1].published)) {
                 return d.published;
             }
         }).filter(function(d) { return d !== undefined; });
@@ -72,7 +83,7 @@ function scale_x() {
         .scale(x_scale)
         .tickValues(tv)
         .tickFormat(function(d) {
-            if (d.getTime() < now) { return d3.time.format("%b %Y")(d); }
+            if (d.getTime() < now) { return format(d); }
             return "Now";
         })
         .orient("bottom");
@@ -181,8 +192,9 @@ function draw_timeline() {
                 height: bar_height,
                 width: bar_width,
                 mask: function(d, i) {
-                    // apply gradient it the document expired
-                    if (bar_width(d, i) >= x_scale(expiration_date(d)) -
+                    // apply gradient if the document is a draft and expired
+                    if (d.name.match(/^draft-/) &&
+                        bar_width(d, i) >= x_scale(expiration_date(d)) -
                                            x_scale(d.published)) {
                         return "url(#fade)";
                     }
diff --git a/ietf/templates/doc/document_charter.html b/ietf/templates/doc/document_charter.html
index ef5396adb..c93d80521 100644
--- a/ietf/templates/doc/document_charter.html
+++ b/ietf/templates/doc/document_charter.html
@@ -6,6 +6,9 @@
 
 {% block pagehead %}
   <link rel="alternate" type="application/atom+xml" href="/feed/group-changes/{{ group.acronym }}/">
+  <script src="{% static 'd3/d3.min.js' %}"></script>
+  <script src="{% static 'jquery/jquery.min.js' %}"></script>
+  <script src="{% static 'ietf/js/document_timeline.js' %}"></script>
 {% endblock %}
 
 {% block title %}{{ doc.title }}{% endblock %}
@@ -218,8 +221,3 @@
   {% endif %}
 
 {% endblock %}
-
-{% block js %}
-<script src="{% static 'd3/d3.min.js' %}"></script>
-<script src="{% static 'ietf/js/document_timeline.js' %}"></script>
-{% endblock %}
diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index 38c25c2d3..a8722fd4a 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -4,6 +4,12 @@
 {% load staticfiles %}
 {% load ietf_filters %}
 
+{% block pagehead %}
+  <script src="{% static 'd3/d3.min.js' %}"></script>
+  <script src="{% static 'jquery/jquery.min.js' %}"></script>
+  <script src="{% static 'ietf/js/document_timeline.js' %}"></script>
+{% endblock %}
+
 {% block title %}{{ doc.title }}{% endblock %}
 
 {% block content %}
@@ -139,9 +145,3 @@
     {{ content|fill:"80"|safe|linebreaksbr|keep_spacing|sanitize_html|safe }}
   {% endif %}
 {% endblock %}
-
-
-{% block js %}
-<script src="{% static 'd3/d3.min.js' %}"></script>
-<script src="{% static 'ietf/js/document_timeline.js' %}"></script>
-{% endblock %}
diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html
index 74cbf4ee0..81264ad44 100644
--- a/ietf/templates/doc/document_draft.html
+++ b/ietf/templates/doc/document_draft.html
@@ -7,6 +7,9 @@
 {% block pagehead %}
   <link rel="alternate" type="application/atom+xml" title="Document changes" href="/feed/document-changes/{{ name }}/">
   <meta name="description" content="{{ doc.title }} {% if doc.get_state_slug == "rfc" %}(RFC {{ rfc_number }}{% if published %}, {{ published.time|date:"F Y" }}{% endif %}{% if obsoleted_by %}; obsoleted by {{ obsoleted_by|join:", " }}{% endif %}){% else %}(Internet-Draft, {{ doc.time|date:"Y" }}){% endif %}">
+  <script src="{% static 'd3/d3.min.js' %}"></script>
+  <script src="{% static 'jquery/jquery.min.js' %}"></script>
+  <script src="{% static 'ietf/js/document_timeline.js' %}"></script>
 {% endblock %}
 
 {% block morecss %}
@@ -509,8 +512,3 @@
     </div>
   {% endif %}
 {% endblock %}
-
-{% block js %}
-<script src="{% static 'd3/d3.min.js' %}"></script>
-<script src="{% static 'ietf/js/document_timeline.js' %}"></script>
-{% endblock %}
diff --git a/ietf/templates/doc/document_material.html b/ietf/templates/doc/document_material.html
index 72ceea15c..1b67eb22c 100644
--- a/ietf/templates/doc/document_material.html
+++ b/ietf/templates/doc/document_material.html
@@ -4,6 +4,12 @@
 {% load staticfiles %}
 {% load ietf_filters %}
 
+{% block pagehead %}
+  <script src="{% static 'd3/d3.min.js' %}"></script>
+  <script src="{% static 'jquery/jquery.min.js' %}"></script>
+  <script src="{% static 'ietf/js/document_timeline.js' %}"></script>
+{% endblock %}
+
 {% block title %}{{ doc.title }}{% endblock %}
 
 {% block content %}
@@ -127,9 +133,3 @@
     {% endif %}
   {% endif %}
 {% endblock %}
-
-
-{% block js %}
-<script src="{% static 'd3/d3.min.js' %}"></script>
-<script src="{% static 'ietf/js/document_timeline.js' %}"></script>
-{% endblock %}
diff --git a/ietf/templates/doc/document_status_change.html b/ietf/templates/doc/document_status_change.html
index 5ea14afdf..318038133 100644
--- a/ietf/templates/doc/document_status_change.html
+++ b/ietf/templates/doc/document_status_change.html
@@ -4,6 +4,12 @@
 {% load staticfiles %}
 {% load ietf_filters %}
 
+{% block pagehead %}
+  <script src="{% static 'd3/d3.min.js' %}"></script>
+  <script src="{% static 'jquery/jquery.min.js' %}"></script>
+  <script src="{% static 'ietf/js/document_timeline.js' %}"></script>
+{% endblock %}
+
 {% block title %}{{ doc.title }}{% endblock %}
 
 {% block content %}
@@ -153,9 +159,3 @@
   {% endif %}
 
 {% endblock %}
-
-
-{% block js %}
-<script src="{% static 'd3/d3.min.js' %}"></script>
-<script src="{% static 'ietf/js/document_timeline.js' %}"></script>
-{% endblock %}