diff --git a/30 Rock - 6x18 - Murphy Brown Lied to Us [SDTV].strm b/30 Rock - 6x18 - Murphy Brown Lied to Us [SDTV].strm
new file mode 100644
index 000000000..334bfaf3f
--- /dev/null
+++ b/30 Rock - 6x18 - Murphy Brown Lied to Us [SDTV].strm	
@@ -0,0 +1 @@
+plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb=C:\Test\Pneumatic\30 Rock - 6x18 - Murphy Brown Lied to Us [SDTV].nzb&nzbname=30 Rock - 6x18 - Murphy Brown Lied to Us [SDTV]
\ No newline at end of file
diff --git a/30 Rock - 6x19 - Live from Studio 6H (East Coast) [SDTV] [Proper].strm b/30 Rock - 6x19 - Live from Studio 6H (East Coast) [SDTV] [Proper].strm
new file mode 100644
index 000000000..809d0cd9e
--- /dev/null
+++ b/30 Rock - 6x19 - Live from Studio 6H (East Coast) [SDTV] [Proper].strm	
@@ -0,0 +1 @@
+plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb=C:\Test\Pneumatic\30 Rock - 6x19 - Live from Studio 6H (East Coast) [SDTV] [Proper].nzb&nzbname=30 Rock - 6x19 - Live from Studio 6H (East Coast) [SDTV] [Proper]
\ No newline at end of file
diff --git a/30 Rock - 6x21 - The Return of Avery Jessup [SDTV].strm b/30 Rock - 6x21 - The Return of Avery Jessup [SDTV].strm
new file mode 100644
index 000000000..3039a5c59
--- /dev/null
+++ b/30 Rock - 6x21 - The Return of Avery Jessup [SDTV].strm	
@@ -0,0 +1 @@
+plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb=C:\Test\Pneumatic\30 Rock - 6x21 - The Return of Avery Jessup [SDTV].nzb&nzbname=30 Rock - 6x21 - The Return of Avery Jessup [SDTV]
\ No newline at end of file
diff --git a/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs b/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs
index dc323d2e7..df0456f43 100644
--- a/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs
+++ b/NzbDrone.Core/Providers/DownloadClients/PneumaticProvider.cs
@@ -60,7 +60,7 @@ namespace NzbDrone.Core.Providers.DownloadClients
                 logger.Trace("NZB Download succeeded, saved to: {0}", filename);
 
                 var contents = String.Format("plugin://plugin.program.pneumatic/?mode=strm&type=add_file&nzb={0}&nzbname={1}", filename, title);
-                _diskProvider.WriteAllText(title + ".strm", contents);
+                _diskProvider.WriteAllText(Path.Combine(_configProvider.SabDropDirectory, title + ".strm"), contents);
                 
                 return true;
             }
diff --git a/NzbDrone.Web/Controllers/SettingsController.cs b/NzbDrone.Web/Controllers/SettingsController.cs
index 6d2cfb7f6..ce24994d1 100644
--- a/NzbDrone.Web/Controllers/SettingsController.cs
+++ b/NzbDrone.Web/Controllers/SettingsController.cs
@@ -111,7 +111,8 @@ namespace NzbDrone.Web.Controllers
                                 SabTvCategorySelectList = tvCategorySelectList,
                                 DownloadClient = (int)_configProvider.DownloadClient,
                                 BlackholeDirectory = _configProvider.BlackholeDirectory,
-                                DownloadClientSelectList = new SelectList(downloadClientTypes, "Key", "Value")
+                                DownloadClientSelectList = new SelectList(downloadClientTypes, "Key", "Value"),
+                                PneumaticDirectory = _configProvider.PneumaticDirectory
                             };
 
             return View(model);
@@ -430,6 +431,7 @@ namespace NzbDrone.Web.Controllers
                 _configProvider.SabDropDirectory = data.DownloadClientDropDirectory;
                 _configProvider.BlackholeDirectory = data.BlackholeDirectory;
                 _configProvider.DownloadClient = (DownloadClientType)data.DownloadClient;
+                _configProvider.PneumaticDirectory = data.PneumaticDirectory;
 
                 return GetSuccessResult();
             }
diff --git a/NzbDrone.Web/Models/DownloadClientSettingsModel.cs b/NzbDrone.Web/Models/DownloadClientSettingsModel.cs
index 66e2e5a8f..d193949d6 100644
--- a/NzbDrone.Web/Models/DownloadClientSettingsModel.cs
+++ b/NzbDrone.Web/Models/DownloadClientSettingsModel.cs
@@ -70,6 +70,12 @@ namespace NzbDrone.Web.Models
         [Description("What method do you download NZBs with?")]
         public int DownloadClient { get; set; }
 
+        [DisplayName("Pneumatic Nzb Directory")]
+        [Description("Directory to save NZBs for Pneumatic, must be able from XBMC")]
+        [DisplayFormat(ConvertEmptyStringToNull = false)]
+        [RequiredIf("DownloadClient", (int)DownloadClientType.Pneumatic, ErrorMessage = "Required when Download Client is Blackhole")]
+        public string PneumaticDirectory { get; set; }
+
         public SelectList SabTvCategorySelectList { get; set; }
         public SelectList DownloadClientSelectList { get; set; }
     }
diff --git a/NzbDrone.Web/NzbDrone.Web.csproj b/NzbDrone.Web/NzbDrone.Web.csproj
index 060760cef..ca5469081 100644
--- a/NzbDrone.Web/NzbDrone.Web.csproj
+++ b/NzbDrone.Web/NzbDrone.Web.csproj
@@ -554,6 +554,9 @@
   <ItemGroup>
     <Content Include="Views\Shared\_MINIPROFILER UPDATED Layout.cshtml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Views\Settings\Pneumatic.cshtml" />
+  </ItemGroup>
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
     <VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
diff --git a/NzbDrone.Web/Views/Settings/DownloadClient.cshtml b/NzbDrone.Web/Views/Settings/DownloadClient.cshtml
index 30c6a02eb..ad721041d 100644
--- a/NzbDrone.Web/Views/Settings/DownloadClient.cshtml
+++ b/NzbDrone.Web/Views/Settings/DownloadClient.cshtml
@@ -41,12 +41,14 @@
         </div>
         
         <div class="jquery-accordion" id="downloadClientAccordion">
-            <h3>
-                <a href="#">Sabnzbd</a></h3>
+            <h3><a href="#">Sabnzbd</a></h3>
             @{Html.RenderPartial("Sabnzbd", Model);}
-            <h3>
-                <a href="#">Blackhole</a></h3>
+            
+            <h3><a href="#">Blackhole</a></h3>
             @{Html.RenderPartial("Blackhole", Model);}
+            
+            <h3><a href="#">Pneumatic</a></h3>
+            @{Html.RenderPartial("Pneumatic", Model);}
         </div>
             
         <button type="submit" class="save_button" disabled="disabled">
diff --git a/NzbDrone.Web/Views/Settings/Pneumatic.cshtml b/NzbDrone.Web/Views/Settings/Pneumatic.cshtml
new file mode 100644
index 000000000..02e68ae16
--- /dev/null
+++ b/NzbDrone.Web/Views/Settings/Pneumatic.cshtml
@@ -0,0 +1,14 @@
+@using NzbDrone.Web.Helpers;
+@model NzbDrone.Web.Models.DownloadClientSettingsModel
+
+@{
+    Layout = null;
+}
+
+<div class="downloadClient">
+    <label class="labelClass">@Html.LabelFor(m => m.PneumaticDirectory)
+        <span class="small">@Html.DescriptionFor(m => m.PneumaticDirectory)</span>
+        <span class="small">@Html.ValidationMessageFor(m => m.PneumaticDirectory)</span>
+    </label>
+    @Html.TextBoxFor(m => m.PneumaticDirectory, new { @class = "inputClass folderLookup" })
+</div>
\ No newline at end of file