diff --git a/CHANGELOG b/CHANGELOG
index 9ccaee69..c48b6e94 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -53,3 +53,6 @@ set incorrectly. Thanks to Lukeman for the fix.
 
 2010-07-16 r157 Fix issues #141, #142 - IMAP infinite loops and ticket 
 pagination issues. Thanks to Walter Doekes for the patches.
+
+2010-07-16 r158 New CSRF functionality for Django 1.1+. Thanks to 
+'litchfield4' for the patch.
diff --git a/templates/helpdesk/base.html b/templates/helpdesk/base.html
index 5516236a..162880bf 100644
--- a/templates/helpdesk/base.html
+++ b/templates/helpdesk/base.html
@@ -21,7 +21,7 @@
                     <li><a href='{% url helpdesk_submit %}'>{% trans "New Ticket" %}</a></li>
                     <li><a href='{% url helpdesk_report_index %}'>{% trans "Stats" %}</a></li>
                     <li><a href='{% url logout %}'>{% trans "Logout" %}</a></li>
-                    {% if not query %}<li><form id='searchform' method='get' action='{% url helpdesk_list %}'><input type='text' name='q' size='10' class='input' value='{% trans "Search..." %}' id='search_query' onFocus='s=document.getElementById("search_query");if (s.value == "{% trans "Search..." %}") { s.value = ""; }' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/><input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' /><input type='hidden' name='search_type' value='header' /></form></li>{% endif %}
+                    {% if not query %}<li><form id='searchform' method='get' action='{% url helpdesk_list %}'><input type='text' name='q' size='10' class='input' value='{% trans "Search..." %}' id='search_query' onFocus='s=document.getElementById("search_query");if (s.value == "{% trans "Search..." %}") { s.value = ""; }' title='{% trans "Enter a keyword, or a ticket number to jump straight to that ticket." %}'/><input type='hidden' name='status' value='1' /><input type='hidden' name='status' value='2' /><input type='hidden' name='status' value='3' /><input type='hidden' name='search_type' value='header' />{% csrf_token %}</form></li>{% endif %}
                 </ul>
             </div>
             <div id='body'>
diff --git a/templates/helpdesk/confirm_delete_saved_query.html b/templates/helpdesk/confirm_delete_saved_query.html
index a490b904..f2da0e9a 100644
--- a/templates/helpdesk/confirm_delete_saved_query.html
+++ b/templates/helpdesk/confirm_delete_saved_query.html
@@ -14,5 +14,5 @@
 
 {% blocktrans %}<p><a href='../'>No, Don't Delete It</a></p>
 
-<form method='post' action='./'><input type='submit' value='Yes - Delete It' /></form>
+<form method='post' action='./'><input type='submit' value='Yes - Delete It' />{% csrf_token %}</form>
 {% endblocktrans %}{% endblock %}
diff --git a/templates/helpdesk/create_ticket.html b/templates/helpdesk/create_ticket.html
index 669d7ab9..15793939 100644
--- a/templates/helpdesk/create_ticket.html
+++ b/templates/helpdesk/create_ticket.html
@@ -27,5 +27,5 @@
     </div>
 </fieldset>
 
-</form>
+{% csrf_token %}</form>
 {% endblock %}
diff --git a/templates/helpdesk/delete_ticket.html b/templates/helpdesk/delete_ticket.html
index b62a7208..a854d59f 100644
--- a/templates/helpdesk/delete_ticket.html
+++ b/templates/helpdesk/delete_ticket.html
@@ -10,5 +10,5 @@
 
 {% blocktrans %}<p><a href='../'>No, Don't Delete It</a></p>
 
-<form method='post' action='./'><input type='submit' value='Yes - Delete It' /></form>
+<form method='post' action='./'><input type='submit' value='Yes - Delete It' />{% csrf_token %}</form>
 {% endblocktrans %}{% endblock %}
diff --git a/templates/helpdesk/edit_ticket.html b/templates/helpdesk/edit_ticket.html
index c57abce7..22b0d647 100644
--- a/templates/helpdesk/edit_ticket.html
+++ b/templates/helpdesk/edit_ticket.html
@@ -29,5 +29,5 @@
     </div>
 </fieldset>
 
-</form>
+{% csrf_token %}</form>
 {% endblock %}
diff --git a/templates/helpdesk/email_ignore_add.html b/templates/helpdesk/email_ignore_add.html
index e79888de..f449a107 100644
--- a/templates/helpdesk/email_ignore_add.html
+++ b/templates/helpdesk/email_ignore_add.html
@@ -22,6 +22,6 @@
 
 <input type='submit' value='{% trans "Ignore E-Mail Address" %}' />
 
-</form>
+{% csrf_token %}</form>
 
 {% endblock %}
diff --git a/templates/helpdesk/email_ignore_del.html b/templates/helpdesk/email_ignore_del.html
index 93268933..61484dc9 100644
--- a/templates/helpdesk/email_ignore_del.html
+++ b/templates/helpdesk/email_ignore_del.html
@@ -10,5 +10,5 @@
 
 {% blocktrans %}<p><a href='../../'>Keep Ignoring It</a></p>
 
-<form method='post' action='./'><input type='submit' value='Stop Ignoring It' /></form>
+<form method='post' action='./'><input type='submit' value='Stop Ignoring It' />{% csrf_token %}</form>
 {% endblocktrans %}{% endblock %}
diff --git a/templates/helpdesk/public_homepage.html b/templates/helpdesk/public_homepage.html
index 927a58dc..e4775e79 100644
--- a/templates/helpdesk/public_homepage.html
+++ b/templates/helpdesk/public_homepage.html
@@ -15,7 +15,7 @@
 
     <input type='submit' value='{% trans "View Ticket" %}' />
 </fieldset>
-</form>
+{% csrf_token %}</form>
 
 <h2 name='submit'>{% trans "Submit a Ticket" %}</h2>
 
@@ -41,5 +41,5 @@
     </div>
 </fieldset>
 
-</form>
+{% csrf_token %}</form>
 {% endblock %}
diff --git a/templates/helpdesk/public_view_form.html b/templates/helpdesk/public_view_form.html
index f24c5001..26ee4677 100644
--- a/templates/helpdesk/public_view_form.html
+++ b/templates/helpdesk/public_view_form.html
@@ -18,7 +18,7 @@
 
     <input type='submit' value='{% trans "View Ticket" %}' />
 </fieldset>
-</form>
+{% csrf_token %}</form>
 
 
 {% endblock %}
diff --git a/templates/helpdesk/ticket.html b/templates/helpdesk/ticket.html
index 0d7d26e4..07b35450 100644
--- a/templates/helpdesk/ticket.html
+++ b/templates/helpdesk/ticket.html
@@ -194,7 +194,7 @@
 
 <input type='submit' value='{% trans "Update This Ticket" %}' />
 
-</form>
+{% csrf_token %}</form>
 
 
 {% endblock %}
diff --git a/templates/helpdesk/ticket_cc_add.html b/templates/helpdesk/ticket_cc_add.html
index 80b9736b..353e6f16 100644
--- a/templates/helpdesk/ticket_cc_add.html
+++ b/templates/helpdesk/ticket_cc_add.html
@@ -20,6 +20,6 @@
 
 <input type='submit' value='{% trans "Save Ticket CC" %}' />
 
-</form>
+{% csrf_token %}</form>
 
 {% endblock %}
diff --git a/templates/helpdesk/ticket_cc_del.html b/templates/helpdesk/ticket_cc_del.html
index 4aa0bb81..56965822 100644
--- a/templates/helpdesk/ticket_cc_del.html
+++ b/templates/helpdesk/ticket_cc_del.html
@@ -10,5 +10,5 @@
 
 {% blocktrans %}<p><a href='../../'>Don't Delete</a></p>
 
-<form method='post' action='./'><input type='submit' value='Yes, Delete' /></form>
+<form method='post' action='./'><input type='submit' value='Yes, Delete' />{% csrf_token %}</form>
 {% endblocktrans %}{% endblock %}
diff --git a/templates/helpdesk/ticket_list.html b/templates/helpdesk/ticket_list.html
index 576708e8..05c7f88a 100644
--- a/templates/helpdesk/ticket_list.html
+++ b/templates/helpdesk/ticket_list.html
@@ -59,7 +59,7 @@ $(document).ready(function() {
         {% endif %}
         </select>
         <input type='button' id='filterBuilderButton' value='+' />
-    </form>
+    {% csrf_token %}</form>
 
     <form method='get' action='./'>
     <div class='filterBox{% if query_params.sorting %} filterBoxShow{% endif %}' id='filterBoxSort'>
@@ -130,7 +130,7 @@ $(document).ready(function() {
     </div>
     <hr style='clear: both;' />
     <input type='submit' value='{% trans "Apply Filter" %}' />
-    </form>
+    {% csrf_token %}</form>
     </div>
     
     {% if not from_saved_query %}
@@ -153,7 +153,7 @@ $(document).ready(function() {
         <input type='submit' value='{% trans "Save Query" %}'>
     </div>
 
-    </form>
+    {% csrf_token %}</form>
     </div>{% endif %}
 
     <div id='tabload'>
@@ -165,7 +165,7 @@ $(document).ready(function() {
         {% endfor %}
     </select></p>
     <input type='submit' value='{% trans "Run Query" %}'>
-    </form>
+    {% csrf_token %}</form>
     </div>
     
 </div>
@@ -216,5 +216,5 @@ $(document).ready(function() {
 <p><label>Select: </label> <a href='#select_all' id='select_all'>All</a> <a href='#select_none' id='select_none'>None</a> <a href='#select_inverse' id='select_inverse'>Inverse</a></p>
 
 <p><label for='id_mass_action'>With Selected Tickets:</label> <select name='action' id='id_mass_action'><option value='take'>Take (Assign to me)</option><option value='delete'>Delete</option><optgroup label='Close'><option value='close'>Close (Don't Send E-Mail)</option><option value='close_public'>Close (Send E-Mail)</option></optgroup><optgroup label='Assign To'><option value='unassign'>Nobody (Unassign)</option>{% for u in user_choices %}<option value='assign_{{ u.id }}'>{{ u.username }}</option>{% endfor %}</optgroup></select> <input type='submit' value='Go' /></p>
-</form>
+{% csrf_token %}</form>
 {% endblock %}
diff --git a/templates/helpdesk/user_settings.html b/templates/helpdesk/user_settings.html
index f737bd73..45cd659a 100644
--- a/templates/helpdesk/user_settings.html
+++ b/templates/helpdesk/user_settings.html
@@ -17,6 +17,6 @@
     {% endfor %}</dl>
 </fieldset>
 <input type='submit' value='{% trans "Save Options" %}' />
-</form>
+{% csrf_token %}</form>
 
 {% endblock %}
diff --git a/templates/registration/login.html b/templates/registration/login.html
index 8fae35e3..467181e9 100644
--- a/templates/registration/login.html
+++ b/templates/registration/login.html
@@ -16,5 +16,5 @@
     </dl>
     <input type='submit' value='{% trans "Login" %}' />
     <input type="hidden" name="next" value="{% if next %}{{ next }}{% else %}../{% endif %}" />
-</form>
+{% csrf_token %}</form>
 {% endblock %}