diff -urp global-6.5-6/geco.rc global-6.5.6/geco.rc
--- global-6.5-6/geco.rc	2016-12-19 10:57:18 +1000
+++ global-6.5.6/geco.rc	2017-01-12 11:48:53 +1000
@@ -22,7 +22,7 @@
 # Author: Tama Communications Corporation
 # 
 # Geco is a quick view tool for GLOBAL using percol and less.
-# It is useful as a lanch pad for vi editor.
+# It is useful as a launch pad for vi editor.
 #
 # Features:
 # o Command line input completion using __geco_completion()
@@ -93,7 +93,7 @@ gecoless()
 {
 	local line IFS=
 	case $__gtags_geco_selector in
-	'')	echo "geco: percol or peco is required."
+	'')	echo "geco: percol, peco or fzf is required."
 		return 1;;
 	esac
 	line=$(cat)
diff -urp global-6.5-6/gtags/gtags.c global-6.5.6/gtags/gtags.c
--- global-6.5-6/gtags/gtags.c	2016-12-19 10:57:18 +1000
+++ global-6.5.6/gtags/gtags.c	2017-01-13 11:47:18 +1000
@@ -222,7 +222,7 @@ main(int argc, char **argv)
 			argv = prepend_options(&argc, argv, env);
 	}
 	/*
-	 * Execute gtags_hook before the jogs.
+	 * Execute gtags_hook before the jobs.
 	 */
 	if (getconfs("gtags_hook", sb)) {
 		char *p = serialize_options(argc, argv);
@@ -357,7 +357,7 @@ main(int argc, char **argv)
 			die("invalid version string of mkid: %s", strbuf_value(sb));
 		switch (check_version(p + 1, REQUIRED_MKID_VERSION)
 #ifdef _WIN32
-			|| strcmp(p + 1, "3.2.99") == 0
+			| strcmp(p + 1, "3.2.99") == 0
 #endif
 			)  {
 		case 1:		break;	/* OK */
diff -urp global-6.5-6/gtags/manual.in global-6.5.6/gtags/manual.in
--- global-6.5-6/gtags/manual.in	2016-12-19 10:57:18 +1000
+++ global-6.5.6/gtags/manual.in	2017-01-13 10:24:05 +1000
@@ -68,7 +68,7 @@
 		The argument @arg{file} can be set to @val{-} to accept a list of
 		files from the standard input.
 		File names must be separated by newline.
-		To make the list, you may use @xref{find,1} which has rich options
+		To make the list you may use @xref{find,1}, which has rich options
 		for selecting files.
 	@address@hidden @arg{file}}
 		Set environment variable @var{GTAGSCONF} to @arg{file}.
@@ -149,9 +149,9 @@
 		If this variable is set, @file{$GTAGSLOGGING} is used as the path name
 		of a log file. There is no default value.
 	@address@hidden
-		This variable can only be referenced from the hook (See gtags_hook).
-		@name{Gtags} set its own effective command line to this variable before
-		calling the hook. Each argument is sepalated by whitespace, and
+		This variable can only be referenced from the hook (see gtags_hook).
+		@name{Gtags} sets its own effective command line to this variable before
+		calling the hook. Each argument is separated by whitespace, and
 		real whitespace is represented as '%20'. This is read only.
 	@address@hidden
 		The value of this variable is inserted in the head of arguments.
@@ -179,7 +179,7 @@
 	@address@hidden (command line)}
 		Specify a command line which should be executed at the beginning of @name{gtags}
 		after loading configuration file. You can use this hook to update
-		@file{gtags.files} dynamically..
+		@file{gtags.files} dynamically.
 		"./" in it always means the project root directory, since @name{gtags} is
 		always invoked there.
 	@address@hidden (boolean)}
@@ -202,7 +202,7 @@
 		@br
 		If the value starts with @samp{/}, it is assumed a relative path name
 		from the root directory of the project. You cannot use glob patterns
-		for a path name. However, this directions is out-of-date, and is not
+		for a path name. However, this direction is out-of-date, and is not
 		recommended. Instead, you can use @option{-f} option which can be combined with
 		@xref{find,1}. Since @xref{find,1} has rich options to select files,
 		you can do everything. Additionally, this technique can also be applied
diff -urp global-6.5-6/gtags.conf.in global-6.5.6/gtags.conf.in
--- global-6.5-6/gtags.conf.in	2016-12-19 10:57:18 +1000
+++ global-6.5.6/gtags.conf.in	2017-01-13 10:35:36 +1000
@@ -17,7 +17,7 @@
 # Configuration file for GNU GLOBAL source code tag system.
 #
 # Basically, GLOBAL doesn't need this configuration file ('gtags.conf'),
-# because it has default values in itsself. If you have this file as
+# because it has default values in itself. If you have this file as
 # '/etc/gtags.conf' or "$HOME/.globalrc" then GLOBAL overwrite the default
 # values with values in the file.
 # Configuration file is also necessary to use plug-in parsers.
diff -urp global-6.5-6/libutil/args.c global-6.5.6/libutil/args.c
--- global-6.5-6/libutil/args.c	2016-12-19 10:57:18 +1000
+++ global-6.5.6/libutil/args.c	2017-01-13 11:39:48 +1000
@@ -29,6 +29,9 @@
 #include "strbuf.h"
 #include "test.h"
 #include "gpathop.h"
+#if (defined(_WIN32) && !defined(__CYGWIN__)) || defined(__DJGPP__)
+#include "path.h"
+#endif
 
 #define ARGS_NOP	0
 #define ARGS_ARGS	1
diff -urp global-6.5-6/libutil/makepath.c global-6.5.6/libutil/makepath.c
--- global-6.5-6/libutil/makepath.c	2016-12-19 10:57:18 +1000
+++ global-6.5.6/libutil/makepath.c	2017-01-13 11:38:15 +1000
@@ -33,6 +33,9 @@
 #include "makepath.h"
 #include "strbuf.h"
 #include "strmake.h"
+#if defined(_WIN32) || defined(__DJGPP__)
+#include "path.h"
+#endif
 
 /**
  * makepath: make path from directory and file.