diff --git a/perl/Gnome-Tomboy/tom b/perl/Gnome-Tomboy/tom
index 069ae144f7274e2c3074d015f9ec77d93cc09737..ae48cc223f4fb2a71116d94039219ebafde7e668 100755
--- a/perl/Gnome-Tomboy/tom
+++ b/perl/Gnome-Tomboy/tom
@@ -50,9 +50,21 @@ use Tomboy::Directory;
 use Tomboy::TOC;
 
 my $toc_file;
-my $note_dir= $ENV{'HOME'} . '/.local/share/tomboy';
-# TODO: does not work on cygwin!
+
 my $note_dir_changed= 0;
+my $note_dir;
+if ($ENV{'OSTYPE'} eq 'cygwin')
+{
+  my $p= `cygpath -O`;
+  chop ($p);
+  my @p= split('/', $p);
+  pop (@p);
+  $note_dir= join ('/', @p, qw(AppData Roaming Tomboy notes));
+}
+else
+{
+  $note_dir= $ENV{'HOME'} . '/.local/share/tomboy';
+}
 
 my $start_tb= 0;
 my $start_visual_editor= 0; # AKA $EDITOR