diff -urp global-6.5.1/global/convert.c global-6.5-1/global/convert.c
--- global-6.5.1/global/convert.c	2015-09-15 12:48:17 +1000
+++ global-6.5-1/global/convert.c	2015-09-16 19:06:03 +1000
@@ -288,6 +288,13 @@ convert_pathname(CONVERT *cv, const char
 			a = strbuf_value(cv->abspath);
 			b = cv->basedir;
 #if defined(_WIN32) || defined(__DJGPP__)
+			/*
+			 * use absolute if on different drives.
+			 */
+			if (tolower(*a) != tolower(*b)) {
+				path = a;
+				break;
+			}
 			while (*a != '/')
 				a++;
 			while (*b != '/')
diff -urp global-6.5.1/gozilla/gozilla.c global-6.5-1/gozilla/gozilla.c
--- global-6.5.1/gozilla/gozilla.c	2015-09-15 12:48:17 +1000
+++ global-6.5-1/gozilla/gozilla.c	2015-09-16 19:06:03 +1000
@@ -618,7 +618,7 @@ show_page_by_url(const char *browser, co
 	 */
 	if (locatestring(browser, "mozilla", MATCH_AT_LAST) ||
 	/*
-	 * Firefox have removed the -remote command live option since version 39.
+	 * Firefox has removed the -remote command line option since version 39.
 	    locatestring(browser, "firefox", MATCH_AT_LAST) ||
 	 */
 	    locatestring(browser, "netscape", MATCH_AT_LAST) ||
diff -urp global-6.5.1/htags/common.c global-6.5-1/htags/common.c
--- global-6.5.1/htags/common.c	2015-09-15 12:48:17 +1000
+++ global-6.5-1/htags/common.c	2015-09-16 19:06:03 +1000
@@ -153,7 +153,7 @@ fputs_nl(const char *s, FILE *op)
 	return 0;
 }
 /*
- * These methods is used to tell lex() the current path infomation.
+ * These methods are used to tell lex() the current path information.
  */
 static char current_path[MAXPATHLEN];
 static char current_dir[MAXPATHLEN];
diff -urp global-6.5.1/libutil/find.c global-6.5-1/libutil/find.c
--- global-6.5.1/libutil/find.c	2015-09-15 12:48:17 +1000
+++ global-6.5-1/libutil/find.c	2015-09-16 19:19:07 +1000
@@ -71,6 +71,7 @@
 #define STRCMP stricmp
 #define STRNCMP strnicmp
 #define ROOT 2
+#define S_ISSOCK(mode) (0)
 #else
 #define STRCMP strcmp
 #define STRNCMP strncmp