diff --git a/application/controllers/Cabrillo.php b/application/controllers/Cabrillo.php
index 062c079ee..734a74c2b 100644
--- a/application/controllers/Cabrillo.php
+++ b/application/controllers/Cabrillo.php
@@ -120,6 +120,7 @@ class Cabrillo extends CI_Controller {
 			$data['categoryoverlay'] = $this->security->xss_clean($this->input->post('categoryoverlay'));
 			$data['operators'] = $this->security->xss_clean($this->input->post('operators'));
 			$data['club'] = $this->security->xss_clean($this->input->post('club'));
+			$data['location'] = $this->security->xss_clean($this->input->post('location'));
 			$data['name'] = $userinfo->user_firstname . ' ' . $userinfo->user_lastname;
 			$data['email'] = $userinfo->user_email;
 			$data['address'] = $this->security->xss_clean($this->input->post('address'));
diff --git a/application/libraries/Cabrilloformat.php b/application/libraries/Cabrilloformat.php
index 78fca1339..2336b5926 100644
--- a/application/libraries/Cabrilloformat.php
+++ b/application/libraries/Cabrilloformat.php
@@ -4,7 +4,7 @@
 class Cabrilloformat {
 
    public function header($contest_id, $callsign, $claimed_score, 
-      $operators, $club, $name, $address, $addresscity, $addressstateprovince, $addresspostalcode, $addresscountry, $soapbox, $gridlocator, 
+      $operators, $club, $location, $name, $address, $addresscity, $addressstateprovince, $addresspostalcode, $addresscountry, $soapbox, $gridlocator, 
       $categoryoverlay, $categorytransmitter, $categorystation, $categorypower, $categorymode, $categoryband, $categoryassisted, $categoryoperator, $email) {
       $cab_header = "";
       $cab_header .= "START-OF-LOG: 3.0"."\r\n";
@@ -21,6 +21,10 @@ class Cabrilloformat {
          $cab_header .= "CLUB: ".$club."\r\n";
       }
 
+      if($location != null) {
+         $cab_header .= "LOCATION: ".$location."\r\n";
+      }
+
       $cab_header .= "CATEGORY-OPERATOR: ".$categoryoperator."\r\n";
       $cab_header .= "CATEGORY-BAND: ".$categoryband."\r\n";
       $cab_header .= "CATEGORY-ASSISTED: ".$categoryassisted."\r\n";
diff --git a/application/views/cabrillo/export.php b/application/views/cabrillo/export.php
index 64136eeac..b36c5ffce 100644
--- a/application/views/cabrillo/export.php
+++ b/application/views/cabrillo/export.php
@@ -6,7 +6,7 @@ $CI =& get_instance();
 $CI->load->library('Cabrilloformat');
 
 echo $CI->cabrilloformat->header($contest_id, $callsign, $claimed_score, 
-	$operators, $club, $name, $address, $addresscity, $addressstateprovince, $addresspostalcode, $addresscountry, $soapbox, $gridlocator, 
+	$operators, $club, $location, $name, $address, $addresscity, $addressstateprovince, $addresspostalcode, $addresscountry, $soapbox, $gridlocator, 
 	$categoryoverlay, $categorytransmitter, $categorystation, $categorypower, $categorymode, $categoryband, $categoryassisted, $categoryoperator, $email);
 foreach ($qsos->result() as $row) {
 	echo $CI->cabrilloformat->qso($row);
diff --git a/application/views/cabrillo/index.php b/application/views/cabrillo/index.php
index 1e85e122a..e9aaf04c8 100644
--- a/application/views/cabrillo/index.php
+++ b/application/views/cabrillo/index.php
@@ -44,6 +44,10 @@
 					<div class="col-md-3 control-label" for="club"><?= __("Club"); ?>: </div>
 					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="club" type="club" name="club" aria-label="club">
 				</div>
+				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
+					<div class="col-md-3 control-label" for="location"><?= __("Location"); ?>: </div>
+					<input class="form-control my-1 me-sm-2 col-md-4 w-auto" id="location" type="location" name="location" aria-label="location">
+				</div>
 				<div hidden="true" class="mb-3 d-flex align-items-center row additionalinfo">
 					<div class="col-md-3 control-label" for="categoryoperator"><?= __("Category Operator") ?>: </div>
 					<select class="form-select my-1 me-sm-2 col-md-4 w-auto" id="categoryoperator" name="categoryoperator">