diff --git a/pylons_app/controllers/changeset.py b/pylons_app/controllers/changeset.py
--- a/pylons_app/controllers/changeset.py
+++ b/pylons_app/controllers/changeset.py
@@ -88,6 +88,7 @@ class ChangesetController(BaseController
     def raw_changeset(self,revision):
         
         hg_model = HgModel()
+        method = request.GET.get('diff','show')
         try:
             c.changeset = hg_model.get_repo(c.repo_name).get_changeset(revision)
         except RepositoryError:
@@ -125,7 +126,8 @@ class ChangesetController(BaseController
                 c.changes.append(('changed', node, diff, cs1, cs2))      
         
         response.content_type = 'text/plain'
-
+        if method == 'download':
+            response.content_disposition = 'attachment; filename=%s.patch' % revision 
         parent = True if len(c.changeset.parents) > 0 else False
         c.parent_tmpl = 'Parent  %s' % c.changeset.parents[0]._hex if parent else ''
     
diff --git a/pylons_app/templates/changeset/changeset.html b/pylons_app/templates/changeset/changeset.html
--- a/pylons_app/templates/changeset/changeset.html
+++ b/pylons_app/templates/changeset/changeset.html
@@ -23,6 +23,18 @@
         ${self.breadcrumbs()}
     </div>
     <div class="table">
+		<div id="body" class="diffblock">
+			<div class="code-header">
+				<div>
+				${_('Changeset')} - r${c.changeset.revision}:${c.changeset.raw_id}
+				 &raquo; <span>${h.link_to(_('raw diff'),
+				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='show'))}</span>
+				 &raquo; <span>${h.link_to(_('download diff'),
+				h.url('raw_changeset_home',repo_name=c.repo_name,revision=c.changeset.raw_id,diff='download'))}</span>
+				</div>
+			</div>
+		</div>
+		    
     <div id="changeset_content">
 		<div class="container">
 			<div class="left">
diff --git a/pylons_app/templates/changeset/raw_changeset.html b/pylons_app/templates/changeset/raw_changeset.html
--- a/pylons_app/templates/changeset/raw_changeset.html
+++ b/pylons_app/templates/changeset/raw_changeset.html
@@ -1,5 +1,5 @@
 # HG changeset patch
-# User ${c.changeset.author}
+# User ${c.changeset.author|n}
 # Date ${"%d %d" % c.changeset._ctx.date()}
 # Node ID ${c.changeset._hex}
 # ${c.parent_tmpl}