diff --git a/pgweb/docs/views.py b/pgweb/docs/views.py
index 56435099..b50d77b7 100644
--- a/pgweb/docs/views.py
+++ b/pgweb/docs/views.py
@@ -23,10 +23,15 @@ def docpage(request, version, typ, filename):
 	else:
 		ver = Decimal(version)
 
-	page = get_object_or_404(DocPage, version=ver, file="%s.html" % filename)
+	if ver < Decimal("7.1"):
+		extension = "htm"
+	else:
+		extension = "html"
+
+	page = get_object_or_404(DocPage, version=ver, file="%s.%s" % (filename, extension))
 
 	if typ=="interactive":
-		comments = DocComment.objects.filter(version=ver, file="%s.html" % filename, approved=True).order_by('posted_at')
+		comments = DocComment.objects.filter(version=ver, file="%s.%s" % (filename, extension), approved=True).order_by('posted_at')
 	else:
 		comments = None
 
diff --git a/pgweb/urls.py b/pgweb/urls.py
index d7cd6866..3e3985f4 100644
--- a/pgweb/urls.py
+++ b/pgweb/urls.py
@@ -42,7 +42,7 @@ urlpatterns = patterns('',
     (r'^mirrors.xml$', 'downloads.views.mirrors_xml'),
     (r'^applications-v2.xml$', 'downloads.views.applications_v2_xml'),
 
-    (r'^docs/(current|\d\.\d)/(static|interactive)/(.*).html$', 'docs.views.docpage'),
+    (r'^docs/(current|\d\.\d)/(static|interactive)/(.*).html?$', 'docs.views.docpage'),
     (r'^docs/(current|\d\.\d)/(static|interactive)/$', 'docs.views.docsrootpage'),
     (r'^docs/(current|\d\.\d)/$', 'docs.views.redirect_root'),