diff --git a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
index 64defd0c..4814abf6 100644
--- a/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
+++ b/conservancy/fundgoal/templates/fundgoal/fundraiser_goal_banner_partial.html
@@ -26,16 +26,16 @@
 {% endcomment %}
 {% with this_match_goal=sitefundgoal.fundraiser_goal_amount this_match_so_far=sitefundgoal.fundraiser_so_far_amount %}
 {% with this_match_remaining=this_match_goal|subtract:this_match_so_far sitefundgoal_timeleft=sitefundgoal.fundraiser_endtime|subtract:datetime_now this_match_exceeded=this_match_so_far|subtract:this_match_goal %}
+ {% if sitefundgoal_timeleft.total_seconds >= -604800 %}
     <div class="fundraiser-top-text ph3 pt2 pb3 mb2 mb3-ns">
       <div class="mw8 center ph2 ph4-ns">
       <div class="mt2 mb3 tc">
+      {% if datetime_now < sitefundgoal.fundraiser_endtime %}
         {% if this_match_remaining <= 0 %}
           Thanks to so many donors, we earned our full match!
           Help us go further to stand up for software freedom &mdash; <a href="/sustainer">sign up now</a>!
         {% else %}
-          {% if sitefundgoal_timeleft.total_seconds <= 0 %}
-            The
-          {% elif sitefundgoal_timeleft.days == 0 %}
+          {% if sitefundgoal_timeleft.days == 0 %}
             For the next {% widthratio sitefundgoal_timeleft.total_seconds 3600 1 %} hours <strong>only</strong>, the
           {% elif sitefundgoal_timeleft.days == 1 %}
             Through tomorrow only, the
@@ -47,6 +47,9 @@
         next ${{ this_match_remaining|floatformat:0|intcomma }} of <a href="/sustainer/">support we receive</a> will be matched!
 
         {% endif %}
+       {% else %}
+	  Thank you so much to all our donors who participated in our donation match challenge!  Here are the results:
+       {% endif %}
       </div>
 
 {% if 1 %}
@@ -73,5 +76,6 @@
 
 </div>
 </div>
+{% endif %}
 {% endwith %}
 {% endwith %}
diff --git a/conservancy/templates/base_conservancy.html b/conservancy/templates/base_conservancy.html
index 886f2d3f..e3a3a88e 100644
--- a/conservancy/templates/base_conservancy.html
+++ b/conservancy/templates/base_conservancy.html
@@ -80,10 +80,7 @@
       <div id="navbar-clear"></div>
 
     </div>
-
-{% if datetime_now < sitefundgoal.fundraiser_endtime %}
   {% include "fundgoal/fundraiser_goal_banner_partial.html" %}
-{% endif %}
 
     <div>
       {% block outercontent %}<div id="mainContent" class="mw8 center ph2 ph3"> {% block content %}{% endblock %}</div>{% endblock %}