diff --git a/AUTHORS b/AUTHORS
index 789524d4c5d4282899cbae674c3a6112f15508cf..8fe99129bc6e57c7d215105d0f5c7d15dac1a52a 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -8,8 +8,8 @@ Chris Allegretta <chrisa@asty.org>
 David Lawrence Ramsey <pooka109@gmail.com>
 	* Former stable series maintainer.  Multiple buffer support,
 	  operating dir (-o) option, bug fixes for display routines,
-	  wrapping code, spelling fixes, const mode, parts of the
-	  UTF-8 support, and various other fixes.
+	  wrapping code, spelling fixes, constantshow mode, parts of
+	  UTF-8 support, softwrap overhaul, and various other fixes.
 
 Jordi Mallach <jordi@gnu.org>
 	* Debian package maintainer, fellow bug squasher.
@@ -39,7 +39,8 @@ Mike Frysinger <vapier@gentoo.org>
 	* Gentoo package maintainer.  Whitespace display mode,
 	  --enable-utf8/--disable-utf8 configure options for ncurses,
 	  many new color regexes and improvements to existing color
-	  regexes in syntax/*.nanorc, and miscellaneous bug fixes.
+	  regexes in syntax/*.nanorc, the move from svn to git, the
+	  conversion to gnulib, and miscellaneous bug fixes.
 
 Mark Majeres <mark@engine12.com>
 	* A functional undo/redo system, and coloring nano's interface.
@@ -56,6 +57,9 @@ Faissal Bensefia <faissaloo@gmail.com>
 Sumedh Pendurkar <sumedh.pendurkar@gmail.com>
 	* The word-completion feature.
 
+Rishabh Dave <rishabhddave@gmail.com>
+	* Searchable help.
+
 Benno Schulenberg <bensberg@justemail.net>
 	* An array of small bug fixes, the cut-word and block-jump
 	  routines, text selection by holding Shift, and some extra
diff --git a/IMPROVEMENTS b/IMPROVEMENTS
index eb840872168fbed65c3ef92da4575701eed3e63d..7466716aae7b6fbced79a2b296c0286eb72e994c 100644
--- a/IMPROVEMENTS
+++ b/IMPROVEMENTS
@@ -2,6 +2,7 @@ Improvements in GNU nano
 ========================
 
 Since 2.8.0:
+  - The ^G help texts have become searchable (with ^W and M-W).
   - Ctrl+Home and Ctrl+End jump to start and end of file.
   - In softwrap mode the cursor now moves per visual row instead of per
     logical line, and the screen will scroll per row.
diff --git a/TODO b/TODO
index dd48f68f1baa908d60ed75aeb0c88db2aa08e2be..4f1fe10125a560f6c2945b35baab1e3d91cfbada 100644
--- a/TODO
+++ b/TODO
@@ -3,8 +3,6 @@ A list of desired features
 
 Somewhat urgent:
 - Make undo/redo work also for justifying and indenting.
-- Allow text searches in the help viewer.
-  See https://savannah.gnu.org/bugs/?28994.
 - Detect when text is being pasted, so that we can handle it faster.
   See https://savannah.gnu.org/bugs/?40060.
 - Allow to define and execute a macro: a stored sequence of keystrokes.
@@ -27,6 +25,9 @@ Vague musings:
 - Allow indentation to add just enough columns to reach the nearest
   multiple of tabsize, rather than always adding tabsize columns?
 
+For version 2.8:
+- Allow text searches in the help viewer. [DONE]
+
 For version 2.4:
 - Handle window resizes better.  After we've resized, we should stay
   wherever we were before we resized, as Pico does. [DONE]
diff --git a/src/help.c b/src/help.c
index 1181bf4b904ccbe591be25b482bf2a9b6902f5ef..d03560b3c9cd4cf63e1ffb19ef43f2d416f8a9a5 100644
--- a/src/help.c
+++ b/src/help.c
@@ -2,7 +2,8 @@
  *   help.c  --  This file is part of GNU nano.                           *
  *                                                                        *
  *   Copyright (C) 2000-2011, 2013-2017 Free Software Foundation, Inc.    *
- *   Copyright (C) 2014, 2015, 2016 Benno Schulenberg                     *
+ *   Copyright (C) 2017 Rishabh Dave                                      *
+ *   Copyright (C) 2014-2017 Benno Schulenberg                            *
  *                                                                        *
  *   GNU nano is free software: you can redistribute it and/or modify     *
  *   it under the terms of the GNU General Public License as published    *
diff --git a/src/winio.c b/src/winio.c
index 232858147cc4f67aeb91aac4019722dc2f4fb2e3..9d747b49ea232b985b02ade8da877571d61c9943 100644
--- a/src/winio.c
+++ b/src/winio.c
@@ -3328,7 +3328,7 @@ void do_credits(void)
 	"",
 	"",
 	"",
-	"(C) 1999 - 2016",
+	"(C) 2017",
 	"Free Software Foundation, Inc.",
 	"",
 	"",