diff --git a/pandora/item/urls.py b/pandora/item/urls.py
index c00949863..6cc1484e4 100644
--- a/pandora/item/urls.py
+++ b/pandora/item/urls.py
@@ -16,7 +16,7 @@ urlpatterns = patterns("item.views",
     (r'^(?P<id>[A-Z0-9].+)/(?P<profile>\d+p)(?P<index>\d*)\.(?P<format>webm|ogv|mp4)$', 'video'),
 
     #torrent
-    (r'^(?P<id>[A-Z0-9][A-Za-z0-9]+)/torrent/(?P<filename>.+?)$', 'torrent'),
+    (r'^(?P<id>[A-Z0-9][A-Za-z0-9]+)/torrent/(?P<filename>.*?)$', 'torrent'),
 
     #icon
     (r'^(?P<id>[A-Z0-9].+)/icon(?P<size>\d*)\.jpg$', 'icon'),
diff --git a/pandora/item/views.py b/pandora/item/views.py
index d94e0c3c1..ab18014ec 100644
--- a/pandora/item/views.py
+++ b/pandora/item/views.py
@@ -624,14 +624,17 @@ def torrent(request, id, filename=None):
         response = HttpFileResponse(item.torrent.path,
                                     content_type='application/x-bittorrent')
         filename = "%s.torrent" % item.get('title')
-        response['Content-Disposition'] = 'attachment; filename="%s"' % filename
+        response['Content-Disposition'] = 'attachment; filename="%s"' % filename.encode('utf-8')
         return response
     while filename.startswith('/'):
         filename = filename[1:]
     filename = filename.replace('/../', '/')
     filename = item.path('torrent/%s' % filename)
     filename = os.path.abspath(os.path.join(settings.MEDIA_ROOT, filename))
-    return HttpFileResponse(filename)
+    response = HttpFileResponse(filename)
+    response['Content-Disposition'] = 'attachment; filename="%s"' % \
+                                      os.path.basename(filename.encode('utf-8'))
+    return response
 
 def video(request, id, profile, index=None, format=None):
     print id, profile, index, format