Index: configure.in
===================================================================
--- configure.in	(revision 1599)
+++ configure.in	(working copy)
@@ -219,6 +219,7 @@
 Tomboy/Addins/Evolution/Makefile
 Tomboy/Addins/FixedWidth/Makefile
 Tomboy/Addins/GalagoPresence/Makefile
+Tomboy/Addins/InsertTimestamp/Makefile
 Tomboy/Addins/NoteOfTheDay/Makefile
 Tomboy/Addins/PrintNotes/Makefile
 Tomboy/Addins/StickyNoteImport/Makefile
Index: Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs
===================================================================
--- Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs	(revision 0)
+++ Tomboy/Addins/InsertTimestamp/InsertTimestampNoteAddin.cs	(revision 0)
@@ -0,0 +1,41 @@
+//
+// InsertTimestampNoteAddin.cs: Inserts a timestamp at the cursor position.
+//
+
+using System;
+
+using Mono.Unix;
+
+namespace Tomboy.InsertTimestamp {
+	public class InsertTimestampNoteAddin : NoteAddin {
+		
+		Gtk.MenuItem item;
+		
+		public override void Initialize ()
+		{
+			item = new Gtk.MenuItem (
+					Catalog.GetString ("Insert Timestamp"));
+			item.Activated += OnMenuItemActivated;
+			item.Show ();
+			AddPluginMenuItem (item);
+		}
+		
+		public override void Shutdown ()
+		{
+			item.Activated -= OnMenuItemActivated;
+		}
+		
+		public override void OnNoteOpened ()
+		{
+		}
+		
+		void OnMenuItemActivated (object sender, EventArgs args)
+		{
+			string format = Catalog.GetString ("dddd, MMMM d, h:mm tt");
+			string text = DateTime.Now.ToString (format);
+			
+			Gtk.TextIter cursor = Buffer.GetIterAtMark (Buffer.InsertMark);
+			Buffer.InsertWithTagsByName (ref cursor, text, "datetime");
+		}
+	}
+}
Index: Tomboy/Addins/InsertTimestamp/InsertTimestamp.addin.xml
===================================================================
--- Tomboy/Addins/InsertTimestamp/InsertTimestamp.addin.xml	(revision 0)
+++ Tomboy/Addins/InsertTimestamp/InsertTimestamp.addin.xml	(revision 0)
@@ -0,0 +1,21 @@
+<Addin id="InsertTimestampAddin"
+	namespace="Tomboy"
+	name="Insert Timestamp"
+	author="Tomboy Project"
+	description="Inserts current date and time at the cursor position."
+	category="Tools"
+	defaultEnabled="false"
+	version="0.1">
+
+	<Runtime>
+		<Import assembly="InsertTimestamp.dll" />
+	</Runtime>
+
+	<Dependencies>
+		<Addin id="Tomboy" version="0.7" />
+	</Dependencies>
+
+	<Extension path="/Tomboy/NoteAddins">
+		<NoteAddin type="Tomboy.InsertTimestamp.InsertTimestampNoteAddin" />
+	</Extension>
++</Addin>
Index: Tomboy/Addins/InsertTimestamp/Makefile.am
===================================================================
--- Tomboy/Addins/InsertTimestamp/Makefile.am	(revision 0)
+++ Tomboy/Addins/InsertTimestamp/Makefile.am	(revision 0)
@@ -0,0 +1,36 @@
+include $(top_srcdir)/Makefile.include
+
+CSFLAGS = 		\
+	-debug 		\
+	-define:DEBUG 	\
+	-target:library
+
+ASSEMBLIES = 					\
+	$(LINK_TOMBOY_EXE)			\
+	$(TOMBOY_LIBS) 				\
+	$(LINK_MONO_ADDINS)			\
+	-r:Mono.Posix
+
+ADDIN_NAME = InsertTimestamp
+TARGET = $(ADDIN_NAME).dll
+CSFILES = \
+	$(srcdir)/InsertTimestampNoteAddin.cs
+RESOURCES = \
+	-resource:$(srcdir)/$(ADDIN_NAME).addin.xml
+
+$(TARGET): $(CSFILES) $(top_builddir)/Tomboy/Tomboy.exe
+	$(CSC) -out:$@ $(CSFLAGS) $(ASSEMBLIES) $(CSFILES) $(RESOURCES)
+
+
+addinsdir = $(pkglibdir)/addins
+addins_DATA = 			\
+	$(TARGET)
+
+EXTRA_DIST =            	\
+	$(CSFILES) \
+	$(srcdir)/$(ADDIN_NAME).addin.xml
+
+CLEANFILES =				\
+	$(TARGET).mdb \
+	$(TARGET)
+
Index: Tomboy/Addins/Makefile.am
===================================================================
--- Tomboy/Addins/Makefile.am	(revision 1599)
+++ Tomboy/Addins/Makefile.am	(working copy)
@@ -5,6 +5,7 @@
 	Evolution		\
 	FixedWidth			\
 	GalagoPresence		\
+	InsertTimestamp		\
 	NoteOfTheDay		\
 	PrintNotes			\
 	StickyNoteImport	\
