diff --git a/NzbDrone.Core/Providers/Indexer/NzbClub.cs b/NzbDrone.Core/Providers/Indexer/NzbClub.cs
index eaba45b66..c009bb0c2 100644
--- a/NzbDrone.Core/Providers/Indexer/NzbClub.cs
+++ b/NzbDrone.Core/Providers/Indexer/NzbClub.cs
@@ -113,7 +113,7 @@ namespace NzbDrone.Core.Providers.Indexer
 
         public override bool EnabledByDefault
         {
-            get { return true; }
+            get { return false; }
         }
 
         protected override string TitlePreParser(SyndicationItem item)
diff --git a/NzbDrone.Web/Content/Images/Indexers/nzbx.png b/NzbDrone.Web/Content/Images/Indexers/nzbx.png
new file mode 100644
index 000000000..ada2b0fcb
Binary files /dev/null and b/NzbDrone.Web/Content/Images/Indexers/nzbx.png differ
diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs
index 948facf33..af79c336a 100644
--- a/NzbDrone.Web/Controllers/SettingsController.cs
+++ b/NzbDrone.Web/Controllers/SettingsController.cs
@@ -111,6 +111,7 @@ namespace NzbDrone.Web.Controllers
                                 NzbIndexEnabled = _indexerProvider.GetSettings(typeof(NzbIndex)).Enable,
                                 NzbClubEnabled = _indexerProvider.GetSettings(typeof(NzbClub)).Enable,
                                 OmgwtfnzbsEnabled = _indexerProvider.GetSettings(typeof(Omgwtfnzbs)).Enable,
+                                NzbxEnabled = _indexerProvider.GetSettings(typeof(Nzbx)).Enable,
 
                                 RssSyncInterval = _configProvider.RssSyncInterval,
 
@@ -404,6 +405,10 @@ namespace NzbDrone.Web.Controllers
                 omgwtfnzbsSettings.Enable = data.OmgwtfnzbsEnabled;
                 _indexerProvider.SaveSettings(omgwtfnzbsSettings);
 
+                var nzbxSettings = _indexerProvider.GetSettings(typeof(Nzbx));
+                nzbxSettings.Enable = data.NzbxEnabled;
+                _indexerProvider.SaveSettings(nzbxSettings);
+
                 _configProvider.NzbsrusUId = data.NzbsrusUId;
                 _configProvider.NzbsrusHash = data.NzbsrusHash;
 
diff --git a/NzbDrone.Web/Models/IndexerSettingsModel.cs b/NzbDrone.Web/Models/IndexerSettingsModel.cs
index 60c2b09fb..2b0b06f60 100644
--- a/NzbDrone.Web/Models/IndexerSettingsModel.cs
+++ b/NzbDrone.Web/Models/IndexerSettingsModel.cs
@@ -79,6 +79,10 @@ namespace NzbDrone.Web.Models
         [Description("Enable downloading episodes from omgwtfnzbs")]
         public bool OmgwtfnzbsEnabled { get; set; }
 
+        [DisplayName("nzbx")]
+        [Description("Enable downloading episodes from nzbx")]
+        public bool NzbxEnabled { get; set; }
+
         [Required(ErrorMessage = "Please enter a valid number of days")]
         [DataType(DataType.Text)]
         [DisplayName("Retention")]
diff --git a/NzbDrone.Web/Views/Settings/Indexers.cshtml b/NzbDrone.Web/Views/Settings/Indexers.cshtml
index bb1aebae2..05b904e6e 100644
--- a/NzbDrone.Web/Views/Settings/Indexers.cshtml
+++ b/NzbDrone.Web/Views/Settings/Indexers.cshtml
@@ -25,13 +25,16 @@
     <label for="fileSharingTalkStatus">File Sharing Talk</label>
 
     @Html.CheckBox("nzbIndexStatus", @Model.NzbIndexEnabled, new { @class = "indexerStatusButton" })
-        <label for="nzbIndexStatus">NzbIndex</label>
+    <label for="nzbIndexStatus">NzbIndex</label>
 
     @Html.CheckBox("nzbClubStatus", @Model.NzbClubEnabled, new { @class = "indexerStatusButton" })
     <label for="nzbClubStatus">Nzb Club</label>
     
     @Html.CheckBox("omgwtfnzbsStatus", @Model.OmgwtfnzbsEnabled, new { @class = "indexerStatusButton" })
-        <label for="omgwtfnzbsStatus">omgwtfnzbs</label>
+    <label for="omgwtfnzbsStatus">omgwtfnzbs</label>
+    
+    @Html.CheckBox("nzbxStatus", @Model.NzbxEnabled, new { @class = "indexerStatusButton" })
+    <label for="nzbxStatus">nzbx</label>
 </div>
 <div id="stylized">
     @using (Html.BeginForm("SaveIndexers", "Settings", FormMethod.Post, new { id = "IndexersForm", name = "IndexersForm", @class = "settingsForm" }))
@@ -139,6 +142,14 @@
                 </label>
                 @Html.TextBoxFor(m => m.OmgwtfnzbsApiKey, new { @class = "inputClass" })
             </div>
+            
+            <h3><a href="#">nzbx</a></h3>
+            <div class="indexerPanel">
+                <label class="labelClass">
+                    Enable <span class="small">@Html.DescriptionFor(m => m.NzbxEnabled)</span>
+                </label>
+                @Html.CheckBoxFor(m => m.NzbxEnabled, new { @class = "inputClass checkClass enabledCheck" })
+            </div>
         </div>
         
         <div class="indexer-global-settings">
@@ -216,6 +227,9 @@
         
         if (id == 'OmgwtfnzbsEnabled')
             $('#omgwtfnzbsStatus').prop('checked', checked);
+        
+        if (id == 'NzbxEnabled')
+            $('#nzbxStatus').prop('checked', checked);
 
         $('.indexerStatusButton').button("refresh");
         reValidate();
@@ -245,6 +259,9 @@
         
         if (id == 'omgwtfnzbsStatus')
             $('#OmgwtfnzbsEnabled').prop('checked', checked);
+        
+        if (id == 'nzbxStatus')
+            $('#NzbxEnabled').prop('checked', checked);
 
         reValidate();
     });