--- a/app/models/ssh_key.rb
+++ b/app/models/ssh_key.rb
@@ -11,8 +11,10 @@ class SshKey < ActiveRecord::Base
   end
   
   def to_key
+    %Q{### START KEY #{self.id || "nil"} ###\n} + 
     %Q{command="gitorious #{user.login}",no-port-forwarding,} + 
-      %Q{no-X11-forwarding,no-agent-forwarding,no-pty #{key}}
+    %Q{no-X11-forwarding,no-agent-forwarding,no-pty #{key}} + 
+    %Q{\n### END KEY #{self.id || "nil"} ###}
   end  
   
   protected

--- a/spec/models/ssh_key_spec.rb
+++ b/spec/models/ssh_key_spec.rb
@@ -43,8 +43,11 @@ describe SshKey do
   
   it "returns a proper ssh key with to_key" do
     ssh_key = create_key
-    exp_key = %Q{command="gitorious #{users(:johan).login}",no-port-forwarding,} + 
-      %Q{no-X11-forwarding,no-agent-forwarding,no-pty #{ssh_key.key}}
+    ssh_key.save!
+    exp_key = %Q{### START KEY #{ssh_key.id} ###\n} + 
+      %Q{command="gitorious #{users(:johan).login}",no-port-forwarding,} + 
+      %Q{no-X11-forwarding,no-agent-forwarding,no-pty #{ssh_key.key}} + 
+      %Q{\n### END KEY #{ssh_key.id} ###}
     ssh_key.to_key.should == exp_key
   end
 end

--- a/spec/spec.opts
+++ b/spec/spec.opts
@@ -4,3 +4,4 @@ progress
 --loadby
 mtime
 --reverse
+--diff