diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
index e6eb01cd7c..089a80e791 100644
--- a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
+++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj
@@ -316,6 +316,9 @@
     <Compile Include="..\MediaBrowser.Model\Updates\PackageVersionInfo.cs">
       <Link>Updates\PackageVersionInfo.cs</Link>
     </Compile>
+    <Compile Include="..\MediaBrowser.Model\Weather\WeatherUnits.cs">
+      <Link>Weather\WeatherUnits.cs</Link>
+    </Compile>
     <Compile Include="..\MediaBrowser.Model\Web\QueryStringDictionary.cs">
       <Link>Web\QueryStringDictionary.cs</Link>
     </Compile>
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 0446046c2b..567f305bcf 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -8,6 +8,18 @@ namespace MediaBrowser.Model.Configuration
     /// </summary>
     public class ServerConfiguration : BaseApplicationConfiguration
     {
+        /// <summary>
+        /// Gets or sets the zip code to use when displaying weather
+        /// </summary>
+        /// <value>The weather location.</value>
+        public string WeatherLocation { get; set; }
+
+        /// <summary>
+        /// Gets or sets the weather unit to use when displaying weather
+        /// </summary>
+        /// <value>The weather unit.</value>
+        public WeatherUnits WeatherUnit { get; set; }
+        
         /// <summary>
         /// Gets or sets a value indicating whether [enable HTTP level logging].
         /// </summary>
diff --git a/MediaBrowser.Model/MediaBrowser.Model.csproj b/MediaBrowser.Model/MediaBrowser.Model.csproj
index 159ad386d1..2068920d8f 100644
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -134,6 +134,7 @@
     <Compile Include="Tasks\TaskTriggerInfo.cs" />
     <Compile Include="Updates\PackageInfo.cs" />
     <Compile Include="Updates\PackageVersionInfo.cs" />
+    <Compile Include="Weather\WeatherUnits.cs" />
     <Compile Include="Web\QueryStringDictionary.cs" />
     <None Include="FodyWeavers.xml" />
   </ItemGroup>
diff --git a/MediaBrowser.Model/Weather/WeatherUnits.cs b/MediaBrowser.Model/Weather/WeatherUnits.cs
new file mode 100644
index 0000000000..d27982e956
--- /dev/null
+++ b/MediaBrowser.Model/Weather/WeatherUnits.cs
@@ -0,0 +1,17 @@
+namespace MediaBrowser.Model.Weather
+{
+    /// <summary>
+    /// Enum WeatherUnits
+    /// </summary>
+    public enum WeatherUnits
+    {
+        /// <summary>
+        /// The fahrenheit
+        /// </summary>
+        Fahrenheit,
+        /// <summary>
+        /// The celsius
+        /// </summary>
+        Celsius
+    }
+}
\ No newline at end of file