diff --git a/src/web/builds.rs b/src/web/builds.rs
index 77a9b4f03..025f8082c 100644
--- a/src/web/builds.rs
+++ b/src/web/builds.rs
@@ -274,6 +274,15 @@ mod tests {
 
             assert!(rows.is_empty());
 
+            let warning = page
+                .select_first(".warning")
+                .expect("missing warning element")
+                .text_contents();
+
+            assert!(warning.contains("has not built"));
+            assert!(warning.contains("queued"));
+            assert!(warning.contains("open an issue"));
+
             Ok(())
         });
     }
diff --git a/templates/crate/builds.html b/templates/crate/builds.html
index 72c97f13c..4d7f52784 100644
--- a/templates/crate/builds.html
+++ b/templates/crate/builds.html
@@ -30,30 +30,40 @@
 {%- block body -%}
     <div class="container">
         <div class="recent-releases-container">
-            <div class="release">
-                <strong>Builds</strong>
-            </div>
+            {%- if builds -%}
+                <div class="release">
+                    <strong>Builds</strong>
+                </div>
 
-            <ul>
-                {%- for build in builds -%}
-                    <li>
-                        <a href="/crate/{{ metadata.name }}/{{ metadata.version }}/builds/{{ build.id }}" class="release">
-                            <div class="pure-g">
-                                <div class="pure-u-1 pure-u-sm-1-24 build">
-                                    {%- if build.build_status -%}
-                                        {{ "check" | fas }}
-                                    {%- else -%}
-                                        {{ "x" | fas }}
-                                    {%- endif -%}
+                <ul>
+                    {%- for build in builds -%}
+                        <li>
+                            <a href="/crate/{{ metadata.name }}/{{ metadata.version }}/builds/{{ build.id }}" class="release">
+                                <div class="pure-g">
+                                    <div class="pure-u-1 pure-u-sm-1-24 build">
+                                        {%- if build.build_status -%}
+                                            {{ "check" | fas }}
+                                        {%- else -%}
+                                            {{ "x" | fas }}
+                                        {%- endif -%}
+                                    </div>
+                                    <div class="pure-u-1 pure-u-sm-10-24">{{ build.rustc_version }}</div>
+                                    <div class="pure-u-1 pure-u-sm-10-24">{{ build.docsrs_version }}</div>
+                                    <div class="pure-u-1 pure-u-sm-3-24 date">{{ build.build_time | timeformat(relative=true) }}</div>
                                 </div>
-                                <div class="pure-u-1 pure-u-sm-10-24">{{ build.rustc_version }}</div>
-                                <div class="pure-u-1 pure-u-sm-10-24">{{ build.docsrs_version }}</div>
-                                <div class="pure-u-1 pure-u-sm-3-24 date">{{ build.build_time | timeformat(relative=true) }}</div>
-                            </div>
-                        </a>
-                    </li>
-                {%- endfor -%}
-            </ul>
+                            </a>
+                        </li>
+                    {%- endfor -%}
+                </ul>
+            {%- else -%}
+                <div class="warning">
+                    docs.rs has not built {{ metadata.name }}-{{ metadata.version }}
+                    <br>
+                    It may still be <a href="/releases/queue">queued</a> or in-progress.
+                    <br>
+                    If you believe this is docs.rs' fault, <a href="https://github.com/rust-lang/docs.rs/issues/new/choose">open an issue</a>.
+                </div>
+            {%- endif -%}
 
             <div class="about">
                 {# BuildsPage.metadata is an `Option<MetaData>`, so accessing it can fail #}