diff --git a/ietf/meeting/views.py b/ietf/meeting/views.py
index c19c635d6..c31df2c1d 100644
--- a/ietf/meeting/views.py
+++ b/ietf/meeting/views.py
@@ -5,6 +5,7 @@ import django.newforms as forms
 from django.utils.html import escape, linebreaks
 import ietf.utils
 from ietf.proceedings import models
+from django.views.generic.list_detail import object_list
 
 def default(request):
     """Default page, with links to sub-pages"""
@@ -30,40 +31,10 @@ def show_html_materials(request, meeting_num=None):
 	return render("meeting/list.html",{})
 
 def show_html_agenda(request, meeting_num=None):
-	#a=models.MeetingTime.objects.all().filter(meeting=68,day_id=0)
-	#print a
-	session = models.WgMeetingSession.objects.all()
-
-# There has to be a better way to do this, than the way i'm doing it here.. 
-# I'm copying the formula from the cgi script.. 
-	sessions = session.filter(meeting=meeting_num)
-# First we get the non sessions lines 98 - 100 from the cgi..
-#	non_sessions = models.NonSession.objects.filter(meeting_num=meeting_num)
-	cbreak_time = models.NonSession.objects.filter(
-					meeting_num=meeting_num).filter(non_session_ref=2)[0]
-	break_time = models.NonSession.objects.filter(
-					meeting_num=meeting_num).filter(non_session_ref=3)[0]
-	fbreak_time = models.NonSession.objects.filter(
-					meeting_num=meeting_num).filter(non_session_ref=6)[0]
-	abreak_time1 = models.NonSession.objects.filter(
-						meeting_num=meeting_num).filter(non_session_ref=6)[0]
-	abreak_time2 = models.NonSession.objects.filter(
-						meeting_num=meeting_num).filter(non_session_ref=6)[0]
-	reg_time = models.NonSession.objects.filter(meeting_num=meeting_num).filter(non_session_ref=1)
-
-	meeting = models.Meeting.objects.filter(meeting_num=meeting_num)[0]
-
-	return render("meeting/agenda.html",
-	{
-		"all_sessions": sessions,
-		"meeting_num": meeting_num,
-		"meeting": meeting,
-		"cbreak_time": cbreak_time,
-		"break_time": break_time,
-		"fbreak_time": fbreak_time
-
-	} )
-
+    meeting_info=models.Meeting.objects.filter(meeting_num=meeting_num)[0]
+    queryset_list=models.WgMeetingSession.objects.filter(meeting_num=meeting_num)
+    queryset_list_sun=models.WgMeetingSession.objects.filter(meeting=meeting_num, sched_time_id1__day_id=0).select_related().order_by("meeting_times.time_id")
+    return object_list(request,queryset=queryset_list, template_name='meeting/agenda.html',allow_empty=True, extra_context={'qs_sun':queryset_list_sun, 'meeting_info':meeting_info, 'meeting_num':meeting_num})
 
 def show(request, meeting_num=None):
     """Show a specific IPR disclosure"""
diff --git a/ietf/proceedings/models.py b/ietf/proceedings/models.py
index f1aadd546..24287b903 100644
--- a/ietf/proceedings/models.py
+++ b/ietf/proceedings/models.py
@@ -155,7 +155,7 @@ class MeetingRoom(models.Model):
 class WgMeetingSession(models.Model, ResolveAcronym):
     session_id = models.AutoField(primary_key=True)
     meeting = models.ForeignKey(Meeting, db_column='meeting_num')
-    group_acronym_id = models.IntegerField()
+    group_acronym = models.ForeignKey(Acronym, primary_key=True, unique=True, editable=False)
     irtf = models.BooleanField()
     num_session = models.IntegerField()
     length_session1 = models.CharField(blank=True, maxlength=100)
diff --git a/ietf/templates/meeting/agenda.html b/ietf/templates/meeting/agenda.html
index b7eb5ff34..671a5bd17 100644
--- a/ietf/templates/meeting/agenda.html
+++ b/ietf/templates/meeting/agenda.html
@@ -4,7 +4,7 @@
 
 <center> 
 <strong> Agenda of the {{ meeting_num }}th IETF Meeting </strong> <br/> 
-<strong> Date of Meeting  {{ meeting.start_date }} - {{ meeting.end_date }} </strong><br />
+<strong> {{ meeting_info.start_date|date:"F j, Y" }} - {{ meeting_info.end_date|date:"F j, Y" }} </strong><br />
 Updated As of : <br />
 </center> 
 
@@ -14,16 +14,10 @@ Updated As of : <br />
 *** Click on a name of the group to get a meeting agenda *** <br />
 </P>
 
+<p><b>SUNDAY, {{ meeting_info.start_date|date:"F j, Y" }}</b><br>
 
-{{ cbreak_time.time_desc }}
- <br />
-{% for session in all_sessions %}
-
-The sessions are: 
-{{ session.num_session }}
-
-
-<br />
+{% for item in qs_sun %}
+{{ item.sched_time_id1.time_desc }} {{ item.group_acronym.name }} - {{ item.sched_room_id1.room_name }}<br>
 {% endfor %}