diff --git a/ChangeLog b/ChangeLog
index 5371ec5..95c4051 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Mon Mar 20 14:12:15 PST 2006  Christian Hammond <chipx86@chipx86.com>
+
+	* tools/notify-send.c:
+	  - Change the help for notify-send to indicate that --expire-timeout
+	    requires milliseconds, not seconds. This fixes bug #28.
+	  - Fixed the short flag for --type to be -T. This fixes bug #18.
+
 Sat Mar 18 14:47:53 PST 2006  Christian Hammond <chipx86@chipx86.com>
 
 	* tools/notify-send.c:
diff --git a/tools/notify-send.c b/tools/notify-send.c
index 66445d9..e0c3bc6 100644
--- a/tools/notify-send.c
+++ b/tools/notify-send.c
@@ -51,20 +51,20 @@ main(int argc, const char **argv)
 		  NULL },
 		{ "expire-time", 't', POPT_ARG_INT | POPT_ARGFLAG_STRIP,
 		  &expire_timeout, 0,
-		  N_("Specifies the timeout in seconds at which to expire the "
+		  N_("Specifies the timeout in milliseconds at which to expire the "
 			 "notification."),
 		  NULL },
 		{ "icon",  'i', POPT_ARG_STRING | POPT_ARGFLAG_STRIP, &icons, 0,
 		  N_("Specifies an icon filename or stock icon to display."),
-		  N_("ICON1,ICON2,...") },
-		{ "type",  't', POPT_ARG_STRING | POPT_ARGFLAG_STRIP, &type, 0,
+		  N_("ICON") },
+		{ "type",  'T', POPT_ARG_STRING | POPT_ARGFLAG_STRIP, &type, 0,
 		  N_("Specifies the notification type."),
-		  N_("ICON1,ICON2,...") },
+		  N_("TYPE") },
 		POPT_AUTOHELP
 		POPT_TABLEEND
 	};
 
-	g_type_init (); 
+	g_type_init();
 
 	opt_ctx = poptGetContext("notify-send", argc, argv, options, 0);
 	poptSetOtherOptionHelp(opt_ctx, "[OPTIONS]* <summary> [body]");