Index: gtk2_ardour/ardour_ui.cc
===================================================================
--- gtk2_ardour/ardour_ui.cc	(revision 10201)
+++ gtk2_ardour/ardour_ui.cc	(working copy)
@@ -2005,7 +2004,7 @@
 		
 		time (&n);
 		localtime_r (&n, &local_time);
-		strftime (timebuf, sizeof(timebuf), "%FT%T", &local_time);
+		strftime (timebuf, sizeof(timebuf), "%FT%H.%M.%S", &local_time);
 		
 		prompter.set_initial_text (timebuf);
 	}
@@ -2027,6 +2026,12 @@
 				msg.run ();
 				goto again;
 			}
+			if (snapname.find (':') != string::npos) {
+				MessageDialog msg (_("To ensure compatibility with various systems\n"
+						     "snapshot names may not contain a ':' character"));
+				msg.run ();
+				goto again;
+			}
 			save_state (snapname, switch_to_it);
 		}
 		break;

