diff --git a/NzbDrone.Api/NzbDrone.Api.csproj b/NzbDrone.Api/NzbDrone.Api.csproj
index d23daf537..52ced19fc 100644
--- a/NzbDrone.Api/NzbDrone.Api.csproj
+++ b/NzbDrone.Api/NzbDrone.Api.csproj
@@ -150,6 +150,7 @@
     <Compile Include="SignalR\Serializer.cs" />
     <Compile Include="SignalR\SignalrDependencyResolver.cs" />
     <Compile Include="SignalR\NzbDronePersistentConnection.cs" />
+    <Compile Include="System\SystemModule.cs" />
     <Compile Include="TinyIoCNancyBootstrapper.cs" />
     <Compile Include="Update\UpdateModule.cs" />
     <Compile Include="Validation\IdValidationRule.cs" />
diff --git a/NzbDrone.Api/System/SystemModule.cs b/NzbDrone.Api/System/SystemModule.cs
new file mode 100644
index 000000000..80a4056bf
--- /dev/null
+++ b/NzbDrone.Api/System/SystemModule.cs
@@ -0,0 +1,37 @@
+using Nancy;
+using NzbDrone.Common;
+using NzbDrone.Api.Extensions;
+
+namespace NzbDrone.Api.System
+{
+    public class SystemModule : NzbDroneApiModule
+    {
+        private readonly IEnvironmentProvider _environmentProvider;
+
+        public SystemModule(IEnvironmentProvider environmentProvider)
+            : base("system")
+        {
+            _environmentProvider = environmentProvider;
+            Get["/status"] = x => GetStatus();
+        }
+
+        private Response GetStatus()
+        {
+            return new
+                {
+                    Version = _environmentProvider.Version,
+                    AppData = _environmentProvider.GetAppDataPath(),
+                    IsAdmin = _environmentProvider.IsAdmin,
+                    IsUserInteractive = _environmentProvider.IsUserInteractive,
+                    BuildTime = _environmentProvider.BuildDateTime,
+                    StartupPath = _environmentProvider.StartUpPath,
+                    OsVersion = _environmentProvider.GetOsVersion(),
+                    IsMono = EnvironmentProvider.IsMono,
+                    IsProduction = EnvironmentProvider.IsProduction,
+                    IsDebug = EnvironmentProvider.IsDebug,
+                    IsLinux = EnvironmentProvider.IsLinux
+                }.AsResponse();
+
+        }
+    }
+}
diff --git a/NzbDrone.Common/IServiceProvider.cs b/NzbDrone.Common/IServiceProvider.cs
index 256ae6182..37e97e8f3 100644
--- a/NzbDrone.Common/IServiceProvider.cs
+++ b/NzbDrone.Common/IServiceProvider.cs
@@ -41,7 +41,7 @@ public virtual bool IsServiceRunning(string name)
             var service = ServiceController.GetServices()
                 .SingleOrDefault(s => String.Equals(s.ServiceName, name, StringComparison.InvariantCultureIgnoreCase));
 
-            return service != null && service.Status == ServiceControllerStatus.Running;
+            return service != null && (service.Status == ServiceControllerStatus.Running || service.Status == ServiceControllerStatus.StartPending);
         }
 
         public virtual void Install(string serviceName)