diff --git a/ChangeLog b/ChangeLog
index 17451e077..74b99df07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,7 @@
 2006-10-28  Alex Roitman  <shura@gramps-project.org>
+	* src/ViewManager.py (ViewManager.about): Use const.py.
+	* src/const.py.in (url_manual): Add the link constant.
+	* src/GrampsDisplay.py (help): Update the link.
 	* src/data/tips.xml.in: Remove extra quotes.
 
 2006-10-28  Don Allingham  <don@gramps-project.org>
diff --git a/src/GrampsDisplay.py b/src/GrampsDisplay.py
index 0cc80ba8a..8e80f82b0 100644
--- a/src/GrampsDisplay.py
+++ b/src/GrampsDisplay.py
@@ -1,7 +1,7 @@
 #
 # Gramps - a GTK+/GNOME based genealogy program
 #
-# Copyright (C) 2002-2005  Donald N. Allingham
+# Copyright (C) 2002-2006  Donald N. Allingham
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,12 +18,18 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 #
 
+# $Id$
+
+import const
+
 def help(target):
     try:
         import gnome
         gnome.help_display('gramps',target)
     except:
-        url('http://gramps-project.org/gramps-manual/gramps-manual-en/index.html')
+        # FIXME: as manual translations appear online, this needs to
+        # become more complex to directo to the correct language
+        url(const.url_manual+'en/')
         
 def url(target):
     try:
@@ -50,8 +56,3 @@ def run_browser(url):
         os.startfile(url)
     except:
         pass
-                          
-    
-
-    
-        
diff --git a/src/ViewManager.py b/src/ViewManager.py
index 0433ecffd..ef8376ee3 100644
--- a/src/ViewManager.py
+++ b/src/ViewManager.py
@@ -573,7 +573,7 @@ class ViewManager:
             pass
         about.set_comments(_(const.comments))
         about.set_website_label(_('GRAMPS Homepage'))
-        about.set_website('http://gramps-project.org')
+        about.set_website(const.url_homepage)
         about.set_authors(const.authors)
         about.set_translator_credits(_(const.translators))
         about.set_documenters(const.documenters)
diff --git a/src/const.py.in b/src/const.py.in
index dbf5352cb..a78e0c87a 100644
--- a/src/const.py.in
+++ b/src/const.py.in
@@ -38,6 +38,7 @@ from gettext import gettext as _
 url_homepage    = "http://gramps-project.org/"
 url_mailinglist = "http://sourceforge.net/mail/?group_id=25770"
 url_bugtracker  = "http://bugs.gramps-project.org/bug_report_advanced_page.php"
+url_manual      = "http://gramps-project.org/manual/2.2/"
 
 #-------------------------------------------------------------------------
 #