diff --git a/manuscript/images/nzbhydra2.png b/manuscript/images/nzbhydra2.png
new file mode 100644
index 0000000..1ac8027
Binary files /dev/null and b/manuscript/images/nzbhydra2.png differ
diff --git a/manuscript/recipies/autopirate.md b/manuscript/recipies/autopirate.md
index f0574a2..9059f17 100644
--- a/manuscript/recipies/autopirate.md
+++ b/manuscript/recipies/autopirate.md
@@ -18,6 +18,7 @@ Tools included in the AutoPirate stack are:
 * **[NZBGet](https://nzbget.net/)** : downloads data from usenet servers based on .nzb definitions, but written in C++ and designed with performance in mind to achieve maximum download speed by using very little system resources (_this is a popular alternative to SABnzbd_)
 * **[RTorrent](https://github.com/rakshasa/rtorrent/wiki)** is a CLI-based torrent client, which when combined with **[ruTorrent](https://github.com/Novik/ruTorrent)** becomes a powerful and fully browser-managed torrent client. (_Yes, it's not Usenet, but Sonarr/Radarr will let fulfill your watchlist using either Usenet **or** torrents, so it's worth including_)
 * **[NZBHydra](https://github.com/theotherp/nzbhydra)** : acts as a "meta-indexer", so that your downloading tools (_radarr, sonarr, etc_) only need to be setup for a single indexes. Also produces interesting stats on indexers, which helps when evaluating which indexers are performing well.
+* **[NZBHydra2](https://github.com/theotherp/nzbhydra2)** : is a high-performance rewrite of the original NZBHydra, with extra features. While still in beta, this NZBHydra2 will eventually supercede NZBHydra
 * **[Sonarr](https://sonarr.tv)** : finds, downloads and manages TV shows
 * **[Radarr](https://radarr.video)** : finds, downloads and manages movies
 * **[Mylar](https://github.com/evilhero/mylar)** : finds, downloads and manages comic books
@@ -119,6 +120,7 @@ Now work your way through the list of tools below, adding whichever tools your w
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/headphones.md b/manuscript/recipies/autopirate/headphones.md
index 21e9e24..a4119ac 100644
--- a/manuscript/recipies/autopirate/headphones.md
+++ b/manuscript/recipies/autopirate/headphones.md
@@ -25,8 +25,7 @@ headphones:
 
 headphones_proxy:
   image: zappi/oauth2_proxy
-  env_file : /var/data/config/autopirate/headphones.env
-  dns_search: myswarm.example.com  
+  env_file : /var/data/config/autopirate/headphones.env 
   networks:
     - internal
     - traefik_public
@@ -63,6 +62,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * Headphones (this page)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/jackett.md b/manuscript/recipies/autopirate/jackett.md
index 54d7d1c..d38ba2d 100644
--- a/manuscript/recipies/autopirate/jackett.md
+++ b/manuscript/recipies/autopirate/jackett.md
@@ -25,7 +25,6 @@ jackett:
 jackett_proxy:
   image: zappi/oauth2_proxy
   env_file : /var/data/config/autopirate/jackett.env
-  dns_search: myswarm.example.com  
   networks:
     - internal
     - traefik_public
@@ -63,6 +62,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * Jackett (this page)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/lazylibrarian.md b/manuscript/recipies/autopirate/lazylibrarian.md
index cc3814b..5f72b8c 100644
--- a/manuscript/recipies/autopirate/lazylibrarian.md
+++ b/manuscript/recipies/autopirate/lazylibrarian.md
@@ -30,7 +30,6 @@ lazylibrarian:
 lazylibrarian_proxy:
   image: zappi/oauth2_proxy
   env_file : /var/data/config/autopirate/lazylibrarian.env
-  dns_search: myswarm.example.com  
   networks:
     - internal
     - traefik_public
@@ -75,6 +74,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * Lazy Librarian (this page)
 * [Headphones](https://github.com/rembo10/headphones)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/mylar.md b/manuscript/recipies/autopirate/mylar.md
index 7b9fe87..f049a6a 100644
--- a/manuscript/recipies/autopirate/mylar.md
+++ b/manuscript/recipies/autopirate/mylar.md
@@ -24,7 +24,6 @@ mylar:
 mylar_proxy:
   image: zappi/oauth2_proxy
   env_file : /var/data/config/autopirate/mylar.env
-  dns_search: myswarm.example.com  
   networks:
     - internal
     - traefik_public
@@ -61,6 +60,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/nzbget.md b/manuscript/recipies/autopirate/nzbget.md
index 504ceef..f6f444e 100644
--- a/manuscript/recipies/autopirate/nzbget.md
+++ b/manuscript/recipies/autopirate/nzbget.md
@@ -30,7 +30,6 @@ nzbget:
 nzbget_proxy:
   image: zappi/oauth2_proxy
   env_file : /var/data/config/autopirate/nzbget.env
-  dns_search: myswarm.example.com
   networks:
     - internal
     - traefik_public
@@ -68,6 +67,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/nzbhydra.md b/manuscript/recipies/autopirate/nzbhydra.md
index af77cc2..99e427c 100644
--- a/manuscript/recipies/autopirate/nzbhydra.md
+++ b/manuscript/recipies/autopirate/nzbhydra.md
@@ -30,7 +30,6 @@ nzbhydra:
 nzbhydra_proxy:
   image: zappi/oauth2_proxy
   env_file : /var/data/config/autopirate/nzbhydra.env
-  dns_search: myswarm.example.com  
   networks:
     - internal
     - traefik_public
@@ -67,6 +66,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * NZBHydra (this page)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/nzbhydra2.md b/manuscript/recipies/autopirate/nzbhydra2.md
new file mode 100644
index 0000000..ec3f462
--- /dev/null
+++ b/manuscript/recipies/autopirate/nzbhydra2.md
@@ -0,0 +1,99 @@
+!!! warning
+    This is not a complete recipe - it's a component of the [AutoPirate](/recipies/autopirate/) "_uber-recipe_", but has been split into its own page to reduce complexity.
+
+
+# NZBHydra 2
+
+[NZBHydra 2](https://github.com/theotherp/nzbhydra2) is a meta search for NZB indexers. It provides easy access to a number of raw and newznab based indexers. You can search all your indexers from one place and use it as an indexer source for tools like Sonarr, Radarr or CouchPotato.
+
+!!! note
+    NZBHydra 2 is a complete rewrite of [NZBHydra (1)](/recipies/autopirate/nzbhybra/). It's currently in Beta. It works mostly fine but some functions might not be completely done and incompatibilities with some tools might still exist. You might want to run both in parallel for migration / testing purposes, but ultimately you'll probably want to switch over to NZBHydra 2 exclusively.
+
+![NZBHydra Screenshot](../../images/nzbhydra2.png)
+
+Features include:
+
+* Searches Anizb, BinSearch, NZBIndex and any newznab compatible indexers. Merges all results, filters them by a number of configurable restrictions, recognizes duplicates and returns them all in one place
+* Add results to [NZBGet](/recipies/autopirate/nzbget/) or [SABnzbd](/recipies/autopirate/sabnzbd/)
+* Support for all relevant media IDs (IMDB, TMDB, TVDB, TVRage, TVMaze) and conversion between them
+* Query generation, meaning a query will be generated if only a media ID is provided in the search and the indexer doesn't support the ID or if no results were found
+* Compatible with [Sonarr](/recipies/autopirate/sonarr/), [Radarr](/recipies/autopirate/radarr/), [NZBGet](/recipies/autopirate/nzbget.md), [SABnzbd](/recipies/autopirate/sabnzbd/), nzb360, CouchPotato, [Mylar](/recipies/autopirate/mylar/), [Lazy Librarian](/recipies/autopirate/lazylibrarian/), Sick Beard, [Jackett/Cardigann](/recipies/autopirate/jackett/), Watcher, etc.
+* Search and download history and extensive stats. E.g. indexer response times, download shares, NZB age, etc.
+* Authentication and multi-user support
+* Automatic update of NZB download status by querying configured downloaders
+* RSS support with configurable cache times
+* Torrent support (_Although I prefer [Jackett](/recipies/autopirate/jackett/) for this_):
+    * For GUI searches, allowing you to download torrents to a blackhole folder
+    * A separate Torznab compatible endpoint for API requests, allowing you to merge multiple trackers
+* Extensive configurability
+* Migration of database and settings from v1
+
+
+## Inclusion into AutoPirate
+
+To include NZBHydra2 in your [AutoPirate](/recipies/autopirate/) stack, include the following in your autopirate.yml stack definition file:
+
+````
+nzbhydra2:
+  image: linuxserver/hydra2:latest
+  env_file : /var/data/config/autopirate/nzbhydra2.env
+  volumes:
+   - /var/data/autopirate/nzbhydra2:/config
+  networks:
+  - internal
+
+nzbhydra2_proxy:
+  image: zappi/oauth2_proxy
+  env_file : /var/data/config/autopirate/nzbhydra2.env
+  networks:
+    - internal
+    - traefik_public
+  deploy:
+    labels:
+      - traefik.frontend.rule=Host:nzbhydra2.example.com
+      - traefik.docker.network=traefik_public
+      - traefik.port=4180
+  volumes:
+    - /var/data/config/autopirate/authenticated-emails.txt:/authenticated-emails.txt
+  command: |
+    -cookie-secure=false
+    -upstream=http://nzbhydra2:5076
+    -redirect-url=https://nzbhydra2.example.com
+    -http-address=http://0.0.0.0:4180
+    -email-domain=example.com
+    -provider=github
+    -authenticated-emails-file=/authenticated-emails.txt
+````
+
+!!! tip
+    I share (_with my [patreon patrons](https://www.patreon.com/funkypenguin)_) a private "_premix_" git repository, which includes necessary docker-compose and env files for all published recipes. This means that patrons can launch any recipe with just a ```git pull``` and a ```docker stack deploy``` 👍
+
+## Assemble more tools..
+
+Continue through the list of tools below, adding whichever tools your want to use, and finishing with the **[end](/recipies/autopirate/end/)** section:
+
+* [SABnzbd](/recipies/autopirate/sabnzbd.md)
+* [NZBGet](/recipies/autopirate/nzbget.md)
+* [RTorrent](/recipies/autopirate/rtorrent/)
+* [Sonarr](/recipies/autopirate/sonarr/)
+* [Radarr](/recipies/autopirate/radarr/)
+* [Mylar](/recipies/autopirate/mylar/)
+* [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
+* [Headphones](/recipies/autopirate/headphones/)
+* [NZBHydra](/recipies/autopirate/nzbhydra/)
+* NZBHydra2 (this page)
+* [Ombi](/recipies/autopirate/ombi/)
+* [Jackett](/recipies/autopirate/jackett/)
+* [End](/recipies/autopirate/end/) (launch the stack)
+
+
+## Chef's Notes 📓
+
+1. In many cases, tools will integrate with each other. I.e., Radarr needs to talk to SABnzbd and NZBHydra2, Ombi needs to talk to Radarr, etc. Since each tool runs within the stack under its own name, just refer to each tool by name (i.e. "radarr"), and docker swarm will resolve the name to the appropriate container. You can identify the tool-specific port by looking at the docker-compose service definition.
+2. Note that NZBHydra2 _can_ co-exist with NZBHydra (1), but if you want your tools (Sonarr, Radarr, etc) to use NZBHydra2, you'll need to change both the target hostname (_to "hydra2"_) and the target port (_to 5076_).
+
+### Tip your waiter (donate) 👏
+
+Did you receive excellent service? Want to make your waiter happy? (_..and support development of current and future recipes!_) See the [support](/support/) page for (_free or paid)_ ways to say thank you! 👏
+
+### Your comments? 💬
diff --git a/manuscript/recipies/autopirate/ombi.md b/manuscript/recipies/autopirate/ombi.md
index 80b1f87..f25e898 100644
--- a/manuscript/recipies/autopirate/ombi.md
+++ b/manuscript/recipies/autopirate/ombi.md
@@ -31,7 +31,6 @@ ombi:
 ombi_proxy:
   image: zappi/oauth2_proxy
   env_file : /var/data/config/autopirate/ombi.env
-  dns_search: myswarm.example.com  
   networks:
     - internal
     - traefik_public
@@ -68,6 +67,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * Ombi (this page)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/plexpy.md b/manuscript/recipies/autopirate/plexpy.md
deleted file mode 100644
index 57e83a7..0000000
--- a/manuscript/recipies/autopirate/plexpy.md
+++ /dev/null
@@ -1,67 +0,0 @@
-!!! warning
-    This is not a complete recipe - it's a component of the [AutoPirate](/recipies/autopirate/) "_uber-recipe_", but has been split into its own page to reduce complexity.
-
-# NAME
-
-Intro
-
-![Plexpy Screenshot](../../images/plexpy.png)
-
-Details
-
-
-
-
-
-
-#### Plexpy
-
-## Inclusion into AutoPirate
-
-To include NZBGet in your [AutoPirate](/recipies/autopirate/) stack, include the following in your autopirate.yml stack definition file:
-
-!!! tip
-        I share (_with my [patreon patrons](https://www.patreon.com/funkypenguin)_) a private "_premix_" git repository, which includes necessary docker-compose and env files for all published recipes. This means that patrons can launch any recipe with just a ```git pull``` and a ```docker stack deploy``` 👍
-
-````
-plexpy:
-  image: linuxserver/plexpy:latest
-  env_file : /var/data/config/autopirate/plexpy.env
-  volumes:
-   - /var/data/autopirate/plexpy:/config
-  networks:
-  - traefik_public
-
-plexpy_proxy:
-  image: zappi/oauth2_proxy
-  env_file : /var/data/config/autopirate/plexpy.env
-  dns_search: myswarm.example.com  
-  networks:
-    - internal
-    - traefik_public
-  deploy:
-    labels:
-      - traefik.frontend.rule=Host:plexpy.example.com
-      - traefik.docker.network=traefik_public
-      - traefik.port=4180
-  volumes:
-    - /var/data/config/autopirate/authenticated-emails.txt:/authenticated-emails.txt
-  command: |
-    -cookie-secure=false
-    -upstream=http://plexpy:8181
-    -redirect-url=https://plexpy.example.com
-    -http-address=http://0.0.0.0:4180
-    -email-domain=example.com
-    -provider=github
-    -authenticated-emails-file=/authenticated-emails.txt
-````
-
-!!! tip
-        I share (_with my [patreon patrons](https://www.patreon.com/funkypenguin)_) a private "_premix_" git repository, which includes necessary docker-compose and env files for all published recipes. This means that patrons can launch any recipe with just a ```git pull``` and a ```docker stack deploy``` 👍
-
-
-## Chef's Notes
-
-1. In many cases, tools will integrate with each other. I.e., Radarr needs to talk to SABnzbd and NZBHydra, Ombi needs to talk to Radarr, etc. Since each tool runs within the stack under its own name, just refer to each tool by name (i.e. "radarr"), and docker swarm will resolve the name to the appropriate container. You can identify the tool-specific port by looking at the docker-compose service definition.
-
-## Your comments?
diff --git a/manuscript/recipies/autopirate/radarr.md b/manuscript/recipies/autopirate/radarr.md
index e1227f4..bf3b2d5 100644
--- a/manuscript/recipies/autopirate/radarr.md
+++ b/manuscript/recipies/autopirate/radarr.md
@@ -39,7 +39,6 @@ radarr:
 radarr_proxy:
   image: zappi/oauth2_proxy
   env_file : /var/data/config/autopirate/radarr.env
-  dns_search: myswarm.example.com  
   networks:
     - internal
     - traefik_public
@@ -76,6 +75,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/rtorrent.md b/manuscript/recipies/autopirate/rtorrent.md
index afd2b5d..48b0947 100644
--- a/manuscript/recipies/autopirate/rtorrent.md
+++ b/manuscript/recipies/autopirate/rtorrent.md
@@ -30,7 +30,6 @@ rtorrent:
 rtorrent_proxy:
   image: skippy/oauth2_proxy
   env_file : /var/data/config/autopirate/rtorrent.env
-  dns_search: myswarm.example.com
   networks:
     - internal
     - traefik_public
@@ -68,6 +67,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/sabnzbd.md b/manuscript/recipies/autopirate/sabnzbd.md
index 5f34abc..05df507 100644
--- a/manuscript/recipies/autopirate/sabnzbd.md
+++ b/manuscript/recipies/autopirate/sabnzbd.md
@@ -27,7 +27,6 @@ sabnzbd:
 sabnzbd_proxy:
   image: zappi/oauth2_proxy
   env_file : /var/data/config/autopirate/sabnzbd.env
-  dns_search: myswarm.example.com
   networks:
     - internal
     - traefik_public
@@ -65,6 +64,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/manuscript/recipies/autopirate/sonarr.md b/manuscript/recipies/autopirate/sonarr.md
index 2d3cebf..4c27da6 100644
--- a/manuscript/recipies/autopirate/sonarr.md
+++ b/manuscript/recipies/autopirate/sonarr.md
@@ -26,7 +26,6 @@ sonarr:
 sonarr_proxy:
   image: zappi/oauth2_proxy
   env_file : /var/data/config/autopirate/sonarr.env
-  dns_search: myswarm.example.com  
   networks:
     - internal
     - traefik_public
@@ -63,6 +62,7 @@ Continue through the list of tools below, adding whichever tools your want to us
 * [Lazy Librarian](/recipies/autopirate/lazylibrarian/)
 * [Headphones](/recipies/autopirate/headphones/)
 * [NZBHydra](/recipies/autopirate/nzbhydra/)
+* [NZBHydra2](/recipies/autopirate/nzbhydra2/)
 * [Ombi](/recipies/autopirate/ombi/)
 * [Jackett](/recipies/autopirate/jackett/)
 * [End](/recipies/autopirate/end/) (launch the stack)
diff --git a/mkdocs.yml b/mkdocs.yml
index b9fd68a..27359bd 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -51,6 +51,7 @@ pages:
         - Lazy Librarian: recipies/autopirate/lazylibrarian.md
         - Headphones: recipies/autopirate/headphones.md
         - NZBHydra: recipies/autopirate/nzbhydra.md
+        - NZBHydra 2: recipies/autopirate/nzbhydra2.md        
         - Ombi: recipies/autopirate/ombi.md
         - Jackett: recipies/autopirate/jackett.md
         - End: recipies/autopirate/end.md