diff --git a/AUTHORS b/AUTHORS
index c1dd0b3ed..2eeba2c1b 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -220,7 +220,7 @@ In the top-level directory, wrote:
 In the subdirectory ice-9, changes to:
     boot-9.scm		documentation.scm	emacs.scm
     ls.scm		session.scm		string-fun.scm
-    threads.scm
+    threads.scm		getopt-long.scm
 In the subdirectory scripts, wrote:
     Makefile.am		PROGRAM
     display-commentary	generate-autoload
@@ -236,8 +236,10 @@ In the subdirectory doc, changes to:
     scheme-scheduling.texi
 In the subdirectory test-suite, changes to:
     guile-test		lib.scm
+In the subdirectory test-suite/tests, wrote:
+    exceptions.test     getopt-long.test
 In the subdirectory test-suite/tests, changes to:
-    exceptions.test	eval.test
+    eval.test
 
 Robert Merkel:
 In the subdirectory doc, co-wrote:
diff --git a/NEWS b/NEWS
index ea966c86d..eadbbf48d 100644
--- a/NEWS
+++ b/NEWS
@@ -6,7 +6,7 @@ Please send Guile bug reports to bug-guile@gnu.org.
 
 Changes since the stable branch:
 
-** Variables have no longer a special behavior for `equal?'. 
+** Variables have no longer a special behavior for `equal?'.
 
 Previously, comparing two variables with `equal?' would recursivly
 compare their values.  This is no longer done.  Variables are now only
@@ -681,6 +681,14 @@ Use module system operations for all variables.
 That is, a call to `throw', `error', etc is now guaranteed to not
 return.
 
+** Bugfix for (ice-9 getopt-long)
+
+Parsing for options that are specified to have `optional' args now checks if
+the next element is an option instead of unconditionally taking it as the
+option arg.
+
+Also, this module is now tested using test-suite/tests/getopt-long.test.
+
 * Changes to the C interface
 
 ** Types have been renamed from scm_*_t to scm_t_*.