diff a/pgadmin/pgAdmin3.cpp b/pgadmin/pgAdmin3.cpp	(rejected hunks)
@@ -1167,6 +1167,8 @@ void pgAdmin3::InitXtraPaths()
 		// Ugly... Greenplum client releases have no predictable numbers, because the path is the server version
 		if (!programFiles.IsEmpty())
 		{
+			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
+			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\bin"));
 			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.3\\bin"));
 			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.2\\bin"));
 			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.1\\bin"));
@@ -1174,6 +1176,8 @@ void pgAdmin3::InitXtraPaths()
 			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-3.3\\bin"));
 			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-3.2\\bin"));
 
+			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-5.0\\lib"));
+			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.4\\lib"));
 			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.3\\lib"));
 			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.2\\lib"));
 			path.Add(programFiles + wxT("\\Greenplum\\greenplum-clients-4.1\\lib"));
@@ -1184,6 +1188,8 @@ void pgAdmin3::InitXtraPaths()
 
 		if (!programFilesX86.IsEmpty())
 		{
+			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-5.0\\bin"));
+			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.4\\bin"));
 			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.3\\bin"));
 			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.2\\bin"));
 			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.1\\bin"));
@@ -1191,6 +1197,8 @@ void pgAdmin3::InitXtraPaths()
 			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-3.3\\bin"));
 			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-3.2\\bin"));
 
+			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-5.0\\lib"));
+			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.4\\lib"));
 			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.3\\lib"));
 			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.2\\lib"));
 			path.Add(programFilesX86 + wxT("\\Greenplum\\greenplum-clients-4.1\\lib"));
@@ -1206,6 +1214,10 @@ void pgAdmin3::InitXtraPaths()
 
 		// Generic Unix paths
 
+		path.Add(wxT("/usr/local/greenplum-clients-5.0/bin"));
+		path.Add(wxT("/opt/local/greenplum-clients-5.0/bin"));
+		path.Add(wxT("/usr/local/greenplum-clients-4.4/bin"));
+		path.Add(wxT("/opt/local/greenplum-clients-4.4/bin"));
 		path.Add(wxT("/usr/local/greenplum-clients-4.3/bin"));
 		path.Add(wxT("/opt/local/greenplum-clients-4.3/bin"));
 		path.Add(wxT("/usr/local/greenplum-clients-4.2/bin"));
@@ -1219,6 +1231,10 @@ void pgAdmin3::InitXtraPaths()
 		path.Add(wxT("/usr/local/greenplum-clients-3.2/bin"));
 		path.Add(wxT("/opt/local/greenplum-clients-3.2/bin"));
 
+		path.Add(wxT("/usr/local/greenplum-clients-5.0/lib"));
+		path.Add(wxT("/opt/local/greenplum-clients-5.0/lib"));
+		path.Add(wxT("/usr/local/greenplum-clients-4.4/lib"));
+		path.Add(wxT("/opt/local/greenplum-clients-4.4/lib"));
 		path.Add(wxT("/usr/local/greenplum-clients-4.3/lib"));
 		path.Add(wxT("/opt/local/greenplum-clients-4.3/lib"));
 		path.Add(wxT("/usr/local/greenplum-clients-4.2/lib"));
@@ -1664,7 +1680,7 @@ void pgAdmin3::InitHelp()
 	if (edbHelpPath.IsEmpty())
 		edbHelpPath = wxT("http://www.enterprisedb.com/docs/en/current/server/");
 	if (gpHelpPath.IsEmpty())
-		gpHelpPath = wxT("http://docs.gopivotal.com/gpdb/index.html");
+		gpHelpPath = wxT("http://gpdb.docs.pivotal.io/s");
 	if (slonyHelpPath.IsEmpty())
 		slonyHelpPath = wxT("http://www.slony.info/documentation/");