diff --git a/webodt/shortcuts.py b/webodt/shortcuts.py
index b41a487..5ce23b1 100644
--- a/webodt/shortcuts.py
+++ b/webodt/shortcuts.py
@@ -7,6 +7,12 @@
 from webodt.converters import converter
 from webodt.helpers import get_mimetype
 
+from django import get_version
+if get_version()[0] >= 1 and get_version()[2] > 5:
+    from django.http import StreamingHttpResponse as HttpResponse
+
+
+
 import webodt
 
 def render_to(format, template_name,
@@ -78,7 +84,7 @@ def render_to_response(template_name,
         content = _ifile(content_fd)
     else:
         content = content_fd.read()
-    response = HttpResponse(content, mimetype=mimetype)
+    response = HttpResponse(content, content_type=mimetype)
     if not filename:
         filename = os.path.basename(template_name)
         filename += '.%s' % format