diff --git a/pinaxcon/settings.py b/pinaxcon/settings.py
index d54920728fb31458f464a52be5e183e564ef4531..ed450c6b193180afa3abf70b35698af2d9dbfea8 100644
--- a/pinaxcon/settings.py
+++ b/pinaxcon/settings.py
@@ -132,11 +132,14 @@ TEMPLATES = [
                 "account.context_processors.account",
                 "pinax_theme_bootstrap.context_processors.theme",
                 "symposion.reviews.context_processors.reviews",
+                "sekizai.context_processors.sekizai",
             ],
         },
     },
 ]
 
+TEMPLATE_DEBUG = False
+
 MIDDLEWARE_CLASSES = [
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
@@ -212,6 +215,18 @@ INSTALLED_APPS = [
     #testing
     "django_nose",
 
+    # wiki
+    'django.contrib.humanize',
+    'django_nyt',
+    'mptt',
+    'sekizai',
+    #'sorl.thumbnail',
+    'wiki',
+    'wiki.plugins.attachments',
+    'wiki.plugins.notifications',
+    #'wiki.plugins.images',
+    'wiki.plugins.macros',
+
     # stylesheets and js
     'compressor',
 ]
@@ -309,6 +324,13 @@ TICKET_PRODUCT_CATEGORY = 1
 
 INVOICE_CURRENCY = "USD"
 
+WIKI_ACCOUNT_HANDLING = False
+WIKI_ACCOUNT_SIGNUP_ALLOWED = False
+
+WIKI_ANONYMOUS_WRITE = False
+WIKI_ANONYMOUS_UPLOAD = False
+
+
 # Use nose to run all tests
 TEST_RUNNER = 'django_nose.NoseTestSuiteRunner'
 
diff --git a/pinaxcon/templates/static_pages/attend/hotels.html b/pinaxcon/templates/static_pages/attend/hotels.html
index adca8b6fb5c2fce2b0baa9672de8c3b6c005f5e4..f5f56ebb25c479d17c835a2083027a83a6e4a887 100644
--- a/pinaxcon/templates/static_pages/attend/hotels.html
+++ b/pinaxcon/templates/static_pages/attend/hotels.html
@@ -36,7 +36,7 @@
 
 <p>The only hotel in Downtown Petaluma is a recently renovated boutique hotel in a 1920s-era building. It's a short walk from North Bay Python's venue, and is close to Petaluma's best places to eat and drink.</p>
 
-<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link by November 1st.</p>
+<p>Hotel Petaluma has offered all of their available rooms to North Bay Python attendees, so if you want to stay as close as possible to the venue, book through our exclusive link.</p>
 
 <h3>Sheraton Petaluma</h3>
 
diff --git a/pinaxcon/templates/wiki/base.html b/pinaxcon/templates/wiki/base.html
new file mode 100644
index 0000000000000000000000000000000000000000..c4b1e707813c7d2062aa68df903147ad237dcb62
--- /dev/null
+++ b/pinaxcon/templates/wiki/base.html
@@ -0,0 +1,32 @@
+{% extends "wiki/base_site.html" %}
+{% load staticfiles %}
+{% load compress %}
+{% load sitetree %}
+{% load sekizai_tags %}
+
+{% block wiki_body %}
+  {% addtoblock "css" %}
+    {% compress css %}
+        <link rel="stylesheet" type="text/x-scss" href="{% static "scss/site.scss" %}">
+    {% endcompress %}
+  {% endaddtoblock %}
+
+  {{ block.super }}
+{% endblock %}
+
+{% block wiki_site_title %} - North Bay Python Wiki{% endblock %}
+
+{% block wiki_header_branding %}
+<a class="navbar-brand" href="/">North Bay Python</a>
+{% endblock %}
+
+{% block wiki_header_navlinks %}
+<ul class="nav navbar-nav">
+  <li class="active"><a href="{% url 'wiki:root' %}">Wiki</a></li>
+  {% sitetree_menu from "main" include "trunk" template "sitetree/menu_bootstrap3.html" %}
+</ul>
+{% endblock %}
+
+{% block wiki_footer_prepend %}
+  All contributions to this wiki page are licensed under a Creative Commons Attribution-ShareAlike 4.0 licence.
+{% endblock %}
diff --git a/pinaxcon/urls.py b/pinaxcon/urls.py
index aee283d7c6faa00e28d54c99d6c53525e2b8ffe9..64481b5165954ad682812e33d665fe70da1069df 100644
--- a/pinaxcon/urls.py
+++ b/pinaxcon/urls.py
@@ -4,6 +4,8 @@ from django.conf.urls.static import static
 from django.contrib.staticfiles.templatetags.staticfiles import static as _static
 from django.views.generic import TemplateView
 from django.views.generic import RedirectView
+from django_nyt.urls import get_pattern as get_nyt_pattern
+from wiki.urls import get_pattern as get_wiki_pattern
 
 from django.contrib import admin
 
@@ -95,10 +97,14 @@ urlpatterns = [
     url(r'^tickets/', include('registrasion.urls')),
     url(r'^nested_admin/', include('nested_admin.urls')),
 
+    url(r'^wiki/notifications/', get_nyt_pattern()),
+    url(r'^wiki/', get_wiki_pattern())
+
     # Catch-all MUST go last.
     #url(r"^", include("pinax.pages.urls")),
 ]
 
+
 urlpatterns += static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 handler500 = views.server_error
diff --git a/requirements/base.txt b/requirements/base.txt
index cd7a6500e448a856d7a542445ec4c67e558c9e0c..94f429e82e3ffe530849e51bfb7e938515b795c6 100644
--- a/requirements/base.txt
+++ b/requirements/base.txt
@@ -17,6 +17,7 @@ django-countries==4.6.1
 easy-thumbnails==2.4.1
 django-timezone-field==2.0
 django-model-utils==3.0.0
+wiki==0.3b3
 
 
 # For testing