diff --git a/pgadmin/utils/misc.cpp b/pgadmin/utils/misc.cpp
index 93b56f8..35062c4 100644
--- a/pgadmin/utils/misc.cpp
+++ b/pgadmin/utils/misc.cpp
@@ -676,7 +676,14 @@ wxString CleanHelpPath(const wxString &path)
 	        thePath.Lower().EndsWith(wxT(".zip")))
 		return thePath;
 
-	// In all othe cases we must have a directory
+	// Not everything is a directory
+	if (thePath.Lower().EndsWith(wxT(".htm")) ||
+	        thePath.Lower().EndsWith(wxT(".html")) ||
+	        thePath.Lower().EndsWith(wxT(".php")) ||
+	        thePath.Lower().EndsWith(wxT(".asp")))
+		return thePath;
+
+	// In all other cases we must have a directory
 	wxString sep;
 
 	// Figure out the appropriate seperator
@@ -763,10 +770,20 @@ void DisplayHelp(const wxString &helpTopic, const HelpType helpType)
 		{
 			// the old help path (stored in the settings) is no longer working
 			static wxString gpHelpPath = settings->GetGpHelpPath();
+			wxPrintf(wxT("misc.cpp: %s\n"), gpHelpPath.c_str());
 
+			if (gpHelpPath.CmpNoCase(wxT("http://docs.gopivotal.com/gpdb/")) == 0)
+			{
+				gpHelpPath = wxT("http://gpdb.docs.pivotal.io/index.html");
+				// Replace the path to the old domain with the link to
+				// the new documentation path
+				// The old link is working for now, but there is no guarantee
+				// that it will stay this way
+				settings->SetGpHelpPath(gpHelpPath);
+			}
 			if (gpHelpPath.CmpNoCase(wxT("http://www.greenplum.com/docs/3300/")) == 0)
 			{
-				gpHelpPath = wxT("http://docs.gopivotal.com/gpdb/");
+				gpHelpPath = wxT("http://gpdb.docs.pivotal.io/index.html");
 				// this is the old link, update the link to the new documentation link
 				// problem: this saves the link into the configuration file
 				settings->SetGpHelpPath(gpHelpPath);