diff --git a/Changelog b/Changelog
index 11464b675..e3467f3b9 100644
--- a/Changelog
+++ b/Changelog
@@ -15,6 +15,8 @@
 	* Added support for being a login shell, so things like
 	    '-su' or '-sh' (stuff where argv[0][0]=='-') will now always 
 	    invoke the shell.  Now you can use BusyBox as a login shell.
+	* ls.c now ignores '-g', since some ftp clients like that sort 
+	    of thing.  Patch thanks to David Vrabel <dvrabel@arcom.co.uk>
 
 	 -Erik Andersen
 
diff --git a/coreutils/ls.c b/coreutils/ls.c
index 0b1aa6221..8b9422ec6 100644
--- a/coreutils/ls.c
+++ b/coreutils/ls.c
@@ -568,6 +568,8 @@ extern int ls_main(int argc, char **argv)
 				opts |= DISP_RECURSIVE;
 				break;
 #endif
+			case 'g': /* ignore -- for ftp servers */
+				break;
 			default:
 				goto print_usage_message;
 			}
diff --git a/ls.c b/ls.c
index 0b1aa6221..8b9422ec6 100644
--- a/ls.c
+++ b/ls.c
@@ -568,6 +568,8 @@ extern int ls_main(int argc, char **argv)
 				opts |= DISP_RECURSIVE;
 				break;
 #endif
+			case 'g': /* ignore -- for ftp servers */
+				break;
 			default:
 				goto print_usage_message;
 			}