diff --git a/php/savesettings.php b/php/savesettings.php
index fddc8ca4..0795add9 100644
--- a/php/savesettings.php
+++ b/php/savesettings.php
@@ -265,8 +265,24 @@ function validDomain($domain_name)
 
 				break;
 
-			default:
+			// Set DNS server domain name
+			case "domainname":
 
+				$domain = $_POST["domain"];
+				if(!validDomain($domain))
+				{
+					$error .= "Domain name ".$domain." is invalid!<br>The domain name has been reset to its previous value";
+				}
+				else
+				{
+					exec("sudo pihole -a domainname ".$domain);
+				}
+				break;
+
+
+			default:
+				// Option not found
+				$debug = true;
 				break;
 		}
 	}
diff --git a/settings.php b/settings.php
index e34962dc..02af8dfe 100644
--- a/settings.php
+++ b/settings.php
@@ -5,6 +5,14 @@
 	$setupVars = parse_ini_file("/etc/pihole/setupVars.conf");
 ?>
 
+<?php if(isset($debug)){ ?>
+<div id="alDebug" class="alert alert-warning alert-dismissible fade in" role="alert">
+    <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
+    <h4><i class="icon fa fa-warning"></i> Debug</h4>
+    <?php print_r($_POST); ?>
+</div>
+<?php } ?>
+
 <?php if(strlen($success) > 0){ ?>
 <div id="alInfo" class="alert alert-info alert-dismissible fade in" role="alert">
     <button type="button" class="close" data-hide="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button>
@@ -40,6 +48,11 @@
 	} else {
 		$piHoleIPv6 = "unknown";
 	}
+	if(isset($setupVars["PIHOLE_DOMAIN"])){
+		$piHoleDomain = $setupVars["PIHOLE_DOMAIN"];
+	} else {
+		$piHoleDomain = "local";
+	}
 	$hostname = trim(file_get_contents("/etc/hostname"), "\x00..\x1F");
 ?>
 		<div class="box box-warning">
@@ -75,6 +88,18 @@
 						<input type="text" class="form-control" disabled value="<?php echo $hostname; ?>">
 					</div>
 				</div>
+				<div class="form-group">
+					<label>Pi-Hole domain name</label>
+					<form role="form" method="post">
+					<div class="input-group">
+						<input type="hidden" name="field" value="domainname">
+						<input type="text" class="form-control" name="domain" value="<?php echo $piHoleDomain; ?>">
+						<div class="input-group-btn">
+							<button type="submit" class="btn btn-primary">Save</button>
+						</div>
+					</div>
+					</form>
+				</div>
 			</div>
 		</div>
 <?php