diff --git a/Tomboy/NoteWindow.cs b/Tomboy/NoteWindow.cs
index 890f07e..bb5287b 100644
--- a/Tomboy/NoteWindow.cs
+++ b/Tomboy/NoteWindow.cs
@@ -174,6 +174,8 @@ namespace Tomboy
 			                            Gdk.ModifierType.Mod1Mask,
 			                            Gtk.AccelFlags.Visible);
 
+			Tomboy.ExitingEvent += OnExit;
+
 			this.Add (box);
 		}
 
@@ -263,6 +265,17 @@ namespace Tomboy
 			NoteUtils.ShowDeletionDialog (single_note_list, this);
 		}
 
+		// 
+		// Save clipboard contents to the clipboard manager before exit
+		// Gives compliance with freedesktop's ClipboardManager specification
+		//
+
+		void OnExit (object sender, EventArgs e)
+		{
+			Gtk.Clipboard clip = GetClipboard(Gdk.Selection.Clipboard);
+			clip.Store();
+		}
+
 		//
 		// Public Children Accessors
 		//
