diff --git a/previous.md b/previous.md
index 1718b38..7bb974f 100644
--- a/previous.md
+++ b/previous.md
@@ -8,14 +8,18 @@ title: Previous Topics
 Previous Topics
 ===============
 
+
 <ul class="listing">
-{% assign past_posts = (site.posts | where: "category" , "posts") %}
-{% for post in past_posts %}
-<li>
-<span>{{ post.date | date: "%B %e, %Y" }}</span>
-<a href="{{ site.url }}{{ post.url }}">
-{{ post.title }} {% if post.author %} &ndash; {{ post.author }} {% endif %}
-</a></li>
+{% assign curDate = site.time | date: '%s' %}
+{% for post in site.posts %}
+    {% assign postStartDate = post.date | date: '%s' %}
+	{% if postStartDate < curDate %}
+	<li>
+	<span>{{ post.date | date: "%B %e, %Y" }}</span>
+	<a href="{{ base }}{{ post.url }}">
+	{{ post.title }} {% if post.author %} &ndash; {{ post.author }} {% endif %}
+	</a></li>
+    {% endif %}
 {% endfor %}
 </ul>
 
diff --git a/upcoming.md b/upcoming.md
index dde18c6..715c4b4 100644
--- a/upcoming.md
+++ b/upcoming.md
@@ -18,13 +18,16 @@ charge of that topic to see if they would like to collaborate.
 
 
 <ul class="listing">
-{% assign upcoming = (site.posts | where: "category", "upcoming") %}
-{% for post in upcoming reversed %}
-<li>
-<span>{{ post.date | date: "%B %e, %Y" }}</span>
-<a href="{{ site.url }}{{ post.url }}">
-{{ post.title }} {% if post.author %} &ndash; {{ post.author }} {% endif %}
-</a></li>
+{% assign curDate = site.time | date: '%s' %}
+{% for post in site.posts reversed %}
+    {% assign postStartDate = post.date | date: '%s' %}
+	{% if postStartDate >= curDate %}
+	<li>
+	<span>{{ post.date | date: "%B %e, %Y" }}</span>
+	<a href="{{ base }}{{ post.url }}">
+	{{ post.title }} {% if post.author %} &ndash; {{ post.author }} {% endif %}
+	</a></li>
+    {% endif %}
 {% endfor %}
 </ul>