diff --git a/helpdesk/settings.py b/helpdesk/settings.py
index e712ad37..0cbd7928 100644
--- a/helpdesk/settings.py
+++ b/helpdesk/settings.py
@@ -78,6 +78,9 @@ HELPDESK_VIEW_A_TICKET_PUBLIC = getattr(settings, 'HELPDESK_VIEW_A_TICKET_PUBLIC
 # show 'submit a ticket' section on public page?
 HELPDESK_SUBMIT_A_TICKET_PUBLIC = getattr(settings, 'HELPDESK_SUBMIT_A_TICKET_PUBLIC', True)
 
+# Should we should the KB categories on the homepage?
+HELPDESK_SHOW_KB_ON_HOMEPAGE = getattr(settings, 'HELPDESK_SHOW_KB_ON_HOMEPAGE', False)
+
 
 
 ''' options for update_ticket views '''
diff --git a/helpdesk/templates/helpdesk/public_homepage.html b/helpdesk/templates/helpdesk/public_homepage.html
index 617fdbdd..1b295adc 100644
--- a/helpdesk/templates/helpdesk/public_homepage.html
+++ b/helpdesk/templates/helpdesk/public_homepage.html
@@ -1,6 +1,22 @@
 {% extends "helpdesk/public_base.html" %}{% load i18n %}
 
 {% block helpdesk_body %}
+
+{% if helpdesk_settings.HELPDESK_SHOW_KB_ON_HOMEPAGE %}
+<h2>{% trans "Knowledgebase Articles" %}</h2>
+
+<table width='100%'>
+<tr class='row_tablehead'><td>{% trans "Knowledgebase Categories" %}</td></tr>
+<tr class='row_columnheads'><th>{% trans "Category" %}</th></tr>
+
+{% for category in kb_categories %}
+<tr class='row_even row_hover'><th><a href='{{ category.get_absolute_url }}'>{{ category.title }}</a></th></tr>
+<tr class='row_odd'><td>{{ category.description }}</td></tr>
+{% endfor %}
+</table>
+
+{% endif %}
+
 {% if helpdesk_settings.HELPDESK_VIEW_A_TICKET_PUBLIC %}
 <h2>{% trans "View a Ticket" %}</h2>
 
diff --git a/helpdesk/views/public.py b/helpdesk/views/public.py
index 1d34a55b..8423d14b 100644
--- a/helpdesk/views/public.py
+++ b/helpdesk/views/public.py
@@ -18,7 +18,7 @@ from django.utils.translation import ugettext as _
 from helpdesk import settings as helpdesk_settings
 from helpdesk.forms import PublicTicketForm
 from helpdesk.lib import send_templated_mail, text_is_spam
-from helpdesk.models import Ticket, Queue, UserSettings
+from helpdesk.models import Ticket, Queue, UserSettings, KBCategory
 
 
 def homepage(request):
@@ -63,10 +63,13 @@ def homepage(request):
         form = PublicTicketForm(initial=initial_data)
         form.fields['queue'].choices = [('', '--------')] + [[q.id, q.title] for q in Queue.objects.filter(allow_public_submission=True)]
 
+    knowledgebase_categories = KBCategory.objects.all()
+
     return render_to_response('helpdesk/public_homepage.html',
         RequestContext(request, {
             'form': form,
             'helpdesk_settings': helpdesk_settings,
+            'kb_categories': knowledgebase_categories
         }))
 
 
diff --git a/setup.py b/setup.py
index 8d1d2d6c..4e95db07 100644
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from distutils.util import convert_path
 from fnmatch import fnmatchcase
 from setuptools import setup, find_packages
 
-version = '0.1.5b'
+version = '0.1.6b'
 
 # Provided as an attribute, so you can append to these instead
 # of replicating them: