diff --git a/extensions/Tools/Makefile.am b/extensions/Tools/Makefile.am
index 778f491..0becd70 100644
--- a/extensions/Tools/Makefile.am
+++ b/extensions/Tools/Makefile.am
@@ -5,4 +5,5 @@ SUBDIRS = 			\
 	LiveWebGallery		\
 	MergeDb			\
 	RawPlusJpeg		\
+	RetroactiveRoll		\
 	ScreensaverConfig
diff --git a/extensions/Tools/RetroactiveRoll/RetroactiveRoll.cs b/extensions/Tools/RetroactiveRoll/RetroactiveRoll.cs
index fb15482..019713a 100644
--- a/extensions/Tools/RetroactiveRoll/RetroactiveRoll.cs
+++ b/extensions/Tools/RetroactiveRoll/RetroactiveRoll.cs
@@ -33,14 +33,14 @@ namespace RetroactiveRoll
 				if (p.Time > import_time)
 					import_time = p.Time;
 
-			RollStore rolls = Core.Database.Rolls;
+			RollStore rolls = App.Instance.Database.Rolls;
 			Roll roll = rolls.Create(import_time);
 			foreach (Photo p in photos) {
 				DbCommand cmd = new DbCommand ("UPDATE photos SET roll_id = :roll_id " +
 							       "WHERE id = :id ",
 							       "roll_id", roll.Id,
 							       "id", p.Id);
-				Core.Database.Database.ExecuteNonQuery (cmd);
+				App.Instance.Database.Database.ExecuteNonQuery (cmd);
 				p.RollId = roll.Id;
 			}
 			Console.WriteLine ("RetroactiveRoll done: " + photos.Length + " photos in roll " + roll.Id);
