diff --git a/lib/viewcvs.py b/lib/viewcvs.py
index a2c706b6..e381f7a1 100644
--- a/lib/viewcvs.py
+++ b/lib/viewcvs.py
@@ -715,6 +715,7 @@ def prep_tags(request, tags):
   links = [ ]
   for tag in tags:
     links.append(_item(name=tag.name, href=url+tag.name))
+  links.sort(lambda a, b: cmp(a.name, b.name))
   return links
 
 def is_viewable_image(mime_type):