diff --git a/po/POTFILES.in b/po/POTFILES.in
index 560ff744e..d3fbf45a3 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,7 +17,6 @@ src/Relationship.py
 src/Reorder.py
 src/ScratchPad.py
 src/Spell.py
-src/TipOfDay.py
 src/ToolTips.py
 src/TransUtils.py
 src/Utils.py
@@ -342,6 +341,7 @@ src/gui/filtereditor.py
 src/gui/grampsbar.py
 src/gui/grampsgui.py
 src/gui/makefilter.py
+src/gui/tipofday.py
 src/gui/utils.py
 src/gui/viewmanager.py
 
diff --git a/src/Makefile.am b/src/Makefile.am
index 7f3064153..efb53d155 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -39,7 +39,6 @@ gdir_PYTHON = \
 	Sort.py\
 	soundex.py\
 	Spell.py\
-	TipOfDay.py\
 	ThumbNails.py\
 	ToolTips.py\
 	TransUtils.py\
diff --git a/src/gui/Makefile.am b/src/gui/Makefile.am
index 25dd837f7..bc40dd60e 100644
--- a/src/gui/Makefile.am
+++ b/src/gui/Makefile.am
@@ -35,6 +35,7 @@ pkgpython_PYTHON = \
 	managedwindow.py \
 	navigator.py \
 	pluginmanager.py \
+	tipofday.py \
 	user.py \
 	utils.py \
 	viewmanager.py
diff --git a/src/gui/grampsgui.py b/src/gui/grampsgui.py
index 0bdac46b1..25cc9b488 100644
--- a/src/gui/grampsgui.py
+++ b/src/gui/grampsgui.py
@@ -208,7 +208,7 @@ class Gramps(object):
         import DbState
         from viewmanager import ViewManager
         from cli.arghandler import ArgHandler
-        import TipOfDay
+        from gui.tipofday import TipOfDay
 
         register_stock_icons()
 
@@ -238,7 +238,7 @@ class Gramps(object):
             self.vm.post_init_interface()
 
         if config.get('behavior.use-tips'):
-            TipOfDay.TipOfDay(self.vm.uistate)
+            TipOfDay(self.vm.uistate)
 
     def argerrorfunc(self, string):
         from QuestionDialog import ErrorDialog
diff --git a/src/TipOfDay.py b/src/gui/tipofday.py
similarity index 100%
rename from src/TipOfDay.py
rename to src/gui/tipofday.py
diff --git a/src/gui/viewmanager.py b/src/gui/viewmanager.py
index d5d9b439f..fd7ee8998 100644
--- a/src/gui/viewmanager.py
+++ b/src/gui/viewmanager.py
@@ -1113,8 +1113,8 @@ class ViewManager(CLIManager):
         """
         Display Tip of the day
         """
-        import TipOfDay
-        TipOfDay.TipOfDay(self.uistate)
+        from gui.tipofday import TipOfDay
+        TipOfDay(self.uistate)
 
     def __plugin_status(self, obj=None):
         """