diff --git a/client/infowindow-description.html b/client/infowindow-description.html
index 4b8918b..8c1af93 100644
--- a/client/infowindow-description.html
+++ b/client/infowindow-description.html
@@ -4,5 +4,6 @@
 <div>{{address2}}</div>
 <div>{{city}}, {{state}} {{postal}}</div>
 {{#if phone}}<div>{{phone}}</div>{{/if}}
+{{#if fax}}<div>{{fax}}</div>{{/if}}
 {{#if web}}<div><a href="http://{{web}}" target="_blank">Website</a></div>{{/if}}
-{{/location}}
\ No newline at end of file
+{{/location}}
diff --git a/client/location-list-description.html b/client/location-list-description.html
index c560c97..14993b6 100644
--- a/client/location-list-description.html
+++ b/client/location-list-description.html
@@ -8,6 +8,7 @@
 			{{#if address2}}<div class="loc-addr2">{{address2}}</div>{{/if}}
 			<div class="loc-addr3">{{city}}, {{state}} {{postal}}</div>
 			{{#if phone}}<div class="loc-phone">{{phone}}</div>{{/if}}
+      {{#if fax}}<div class="loc-fax">{{fax}}</div>{{/if}}
 			{{#if web}}<div class="loc-web"><a href="http://{{web}}" target="_blank">Website</a></div>{{/if}}
 			{{#if email}}<div class="loc-email"><a href="mailto:{{email}}">Email</a></div>{{/if}}
 			<div class="loc-dist">
@@ -17,4 +18,4 @@
 		</div>
 	</div>
 </li>
-{{/location}}
\ No newline at end of file
+{{/location}}
diff --git a/src/objects/Location.php b/src/objects/Location.php
index fa2e874..068a686 100644
--- a/src/objects/Location.php
+++ b/src/objects/Location.php
@@ -19,6 +19,7 @@
  * @property string $Phone
  * @property string $Email
  * @property string $EmailAddress
+ * @property string $Fax
  * @property int $Import_ID
  *
  * @method ManyManyList Categories
@@ -49,6 +50,7 @@ class Location extends DataObject implements PermissionProvider
         'Website' => 'Varchar(255)',
         'Phone' => 'Varchar(40)',
         'Email' => 'Varchar(255)',
+        'Fax' => 'Varchar(45)',
         'Import_ID' => 'Int',
     );
 
diff --git a/templates/Dynamic/Locator/Data/JSON.ss b/templates/Dynamic/Locator/Data/JSON.ss
index e3218a2..2c9181b 100644
--- a/templates/Dynamic/Locator/Data/JSON.ss
+++ b/templates/Dynamic/Locator/Data/JSON.ss
@@ -6,6 +6,7 @@
       "Featured": $Featured,
       "Website": "$Website",
       "Phone": "$Phone",
+      "Fax": "$Fax",
       "Email": "$Email",
       "Address": "$Address",
       "Address2": "$Address2",
diff --git a/templates/Dynamic/Locator/Data/XML.ss b/templates/Dynamic/Locator/Data/XML.ss
index 939a459..741bc36 100644
--- a/templates/Dynamic/Locator/Data/XML.ss
+++ b/templates/Dynamic/Locator/Data/XML.ss
@@ -1,4 +1,4 @@
 <markers>
-	<% loop $Locations %><marker name="$Title.XML" lat="$Lat.XML" lng="$Lng.XML" category="$Category.Name.XML" address="$Address.XML" address2="$Address2.XML" city="$City.XML" state="$State.XML" postal="$PostalCode.XML" country="$Country.XML" phone="$Phone.XML" web="$Website.XML" email="$Email.XML" featured="$Featured.NiceAsBoolean.XML" <% if $distance %>distance="$Distance"<% end_if %>/>
+	<% loop $Locations %><marker name="$Title.XML" lat="$Lat.XML" lng="$Lng.XML" category="$Category.Name.XML" address="$Address.XML" address2="$Address2.XML" city="$City.XML" state="$State.XML" postal="$PostalCode.XML" country="$Country.XML" phone="$Phone.XML" fax="$Fax.XML" web="$Website.XML" email="$Email.XML" featured="$Featured.NiceAsBoolean.XML" <% if $distance %>distance="$Distance"<% end_if %>/>
 	<% end_loop %>
 </markers>
diff --git a/tests/objects/LocationTest.php b/tests/objects/LocationTest.php
index a6f1777..6ecd126 100644
--- a/tests/objects/LocationTest.php
+++ b/tests/objects/LocationTest.php
@@ -42,6 +42,7 @@ public function testFieldLabels()
             'Website' => 'Website',
             'Phone' => 'Phone',
             'Email' => 'Email',
+            'Fax' => 'Fax',
             'Address' => 'Address',
             'City' => 'City',
             'State' => 'State',