diff --git a/HISTORY.rst b/HISTORY.rst
index 5abe1a70..4555f655 100644
--- a/HISTORY.rst
+++ b/HISTORY.rst
@@ -9,6 +9,7 @@ PlatformIO 3.0
 
 * Added aliases (off, light, strict) for
   `LDF Compatibility Mode <http://docs.platformio.org/page/librarymanager/ldf.html>`__
+* Search for a library using PIO Library Registry ID ``id:X`` (e.g. ``pio lib search id:13``)
 * Show device system information (MCU, Frequency, RAM, Flash, Debugging tools)
   in a build log
 * Show all available upload protocols before firmware uploading in a build log
diff --git a/docs b/docs
index 1a59e06e..e050d472 160000
--- a/docs
+++ b/docs
@@ -1 +1 @@
-Subproject commit 1a59e06e021de0f1ecd710ac2bcb7b66897c7dd7
+Subproject commit e050d472ea75ae8cd088da1d4b3fc37cd8e2b245
diff --git a/platformio/commands/lib.py b/platformio/commands/lib.py
index 12c066d5..ee2ec01d 100644
--- a/platformio/commands/lib.py
+++ b/platformio/commands/lib.py
@@ -186,6 +186,7 @@ def print_lib_item(item):
 @click.argument("query", required=False, nargs=-1)
 @click.option("--json-output", is_flag=True)
 @click.option("--page", type=click.INT, default=1)
+@click.option("--id", multiple=True)
 @click.option("-n", "--name", multiple=True)
 @click.option("-a", "--author", multiple=True)
 @click.option("-k", "--keyword", multiple=True)