diff --git a/changelog b/changelog
index 3c4be5a749c..bec5c18e1a0 100644
--- a/changelog
+++ b/changelog
@@ -4,6 +4,9 @@ Version 1.11.8+dev:
  * Units:
    * Fixed subtle magenta TC for the Giant Mudcrawler sprites not being
      enabled in-game.
+ * User interface:
+   * Fixed hidden variations of unit types (hide_help=yes) being listed in the
+     help browser when they shouldn't.
  * Miscellaneous and bug fixes:
    * Added -Wno-documentation-deprecated-sync to the CMake pedantic flags.
    * Fixed several Doxygen issues found by Clang 3.4.
diff --git a/players_changelog b/players_changelog
index 3ccd543970f..6d8dcc6546b 100644
--- a/players_changelog
+++ b/players_changelog
@@ -10,6 +10,10 @@ Version 1.11.8+dev:
    * Fixed subtle magenta TC for the Giant Mudcrawler sprites not being
      enabled in-game.
 
+ * User interface:
+   * Fixed hidden variations of unit types (hide_help=yes) being listed in the
+     help browser when they shouldn't.
+
  * Miscellaneous and bug fixes:
    * Fixed possible invalid memory access issue in the MP sides configuration
      code causing crashes for some users (bug #21449).
diff --git a/src/help.cpp b/src/help.cpp
index 2900aa87ed8..fdcc0ad1c11 100644
--- a/src/help.cpp
+++ b/src/help.cpp
@@ -1478,6 +1478,10 @@ public:
 		BOOST_FOREACH(const std::string &var_id, parent->variations()) {
 			const unit_type &type = parent->get_variation(var_id);
 
+			if(type.hide_help()) {
+				continue;
+			}
+
 			if (first) {
 				ss << _("Variations: ");
 				first = false;