diff --git a/HISTORY.rst b/HISTORY.rst
index 0f41ac40..dcd8c570 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -7,7 +7,7 @@ PlatformIO 3.0
 3.0.0 (2016-??-??)
 ~~~~~~~~~~~~~~~~~~
 
-* PlatformIO Plus
+* `PlatformIO Plus <https://pioplus.com>`__
 
   + Local and Embedded `Unit Testing <http://docs.platformio.org/en/latest/unit_testing.html>`__
     (`issue #408 <https://github.com/platformio/platformio/issues/408>`_,
@@ -42,6 +42,7 @@ PlatformIO 3.0
     (`issue #588 <https://github.com/platformio/platformio/issues/588>`_)
   + Allowed ``library.json`` to specify sources other than PlatformIO's Repository
     (`issue #461 <https://github.com/platformio/platformio/issues/461>`_)
+  + Search libraries by headers/includes with ``platformio lib search --header`` option
 
 * New Intelligent Library Build System
 
diff --git a/docs/projectconf.rst b/docs/projectconf.rst
index 9cf240fe..832c2571 100644
--- a/docs/projectconf.rst
+++ b/docs/projectconf.rst
@@ -787,7 +787,7 @@ Example:
 .. seealso::
     Please make sure to read :ref:`ldf` guide first.
 
-A list with extra directories/storages where Library Dependency Finder will
+A list with extra directories/storages where :ref:`ldf` will
 look for dependencies. Multiple paths are allowed. Please separate them
 using comma+space ", ".
 
diff --git a/platformio/commands/lib.py b/platformio/commands/lib.py
index bbb196b7..79a082c3 100644
--- a/platformio/commands/lib.py
+++ b/platformio/commands/lib.py
@@ -164,6 +164,7 @@ def echo_liblist_item(item):
 @click.option("-k", "--keyword", multiple=True)
 @click.option("-f", "--framework", multiple=True)
 @click.option("-p", "--platform", multiple=True)
+@click.option("-i", "--header", multiple=True)
 @click.option(
     "--noninteractive",
     is_flag=True,