diff --git a/perl/Gnome-Tomboy/lib/Tomboy.pm b/perl/Gnome-Tomboy/lib/Tomboy.pm
index 68b51d3d04b979bc193bbcff86b56b6a540cc136..d614e6a33b99d09b99584746d2eead868e366250 100644
--- a/perl/Gnome-Tomboy/lib/Tomboy.pm
+++ b/perl/Gnome-Tomboy/lib/Tomboy.pm
@@ -23,7 +23,8 @@ package Tomboy;
 
 use strict;
 
-use UUID;
+# use UUID;
+use Data::UUID;
 use POSIX;
 
 my %options_passed= map { $_ => 1 } qw(--note-path); # used by start_tb() function
@@ -57,10 +58,21 @@ sub ts_ISO
 
 sub get_uuid
 {
+
+=begin comment
+
   my ($uuid, $uuid_str);
   UUID::generate ($uuid);
   UUID::unparse ($uuid, $uuid_str);
   $uuid_str;
+
+=end comment
+=cut
+
+  my $uc= new Data::UUID;
+  my $str= $uc->create_str();
+  $str =~ tr/A-F/a-f/;
+  $str;
 }
 
 sub start_tb
diff --git a/perl/Gnome-Tomboy/tom b/perl/Gnome-Tomboy/tom
index cdf03c761fa7aca94c36464337ae56b0b6da0d54..fe0cee23b0c847e603bf4d98c33104801573f9de 100755
--- a/perl/Gnome-Tomboy/tom
+++ b/perl/Gnome-Tomboy/tom
@@ -111,6 +111,7 @@ elsif ($op_code eq 'show') { find_note ('uuid', $_) foreach (@PAR); }
 elsif ($op_code eq 'toc')  { tom_toc(); }
 elsif ($op_code eq 'csv')  { tom_csv(); }
 elsif ($op_code eq 'find') { find_note('title', @PAR); }
+elsif ($op_code eq 'uuid') { my $uuid= Tomboy::get_uuid(); print $uuid, "\n"; }
 elsif ($op_code eq 'diff')
 {
   my $f1= shift (@PAR);
diff --git a/perl/Gnome-Tomboy/x_uuid.pl b/perl/Gnome-Tomboy/x_uuid.pl
index af944f85e36afbc9f1b041193ca80d3bcaea5bb6..30998ae98d30206e87cef9c2efa793c1528203da 100755
--- a/perl/Gnome-Tomboy/x_uuid.pl
+++ b/perl/Gnome-Tomboy/x_uuid.pl
@@ -4,12 +4,16 @@ use strict;
 
 use UUID;
 use Data::UUID;
+use POSIX;
 
-for (my $i= 0; $i< 10; $i++)
+my $max= shift (@ARGV) || 10;
+
+for (my $i= 0; $i< $max; $i++)
 {
   my $u1= get_uuid_1();
   my $u2= get_uuid_2();
-  printf ("%3d %s %s\n", $i, $u1, $u2);
+  my $ts= ts_iso();
+  printf ("%5d %s %s %s\n", $i, $ts, $u1, $u2);
 }
 
 sub get_uuid_1
@@ -38,3 +42,9 @@ sub get_uuid_2
   $str;
 }
 
+sub ts_iso
+{
+  my $ts_iso= strftime ('%FT%T.000000%z', localtime(time()));
+  # print "ts_iso=[$ts_iso]\n";
+  $ts_iso;
+}