diff --git a/include/sysinfo.php b/include/sysinfo.php
index c09724a..8006cc0 100644
--- a/include/sysinfo.php
+++ b/include/sysinfo.php
@@ -94,7 +94,8 @@
 	$output = shell_exec('cat /proc/uptime');
 	$uptime = format_time(substr($output,0,strpos($output," ")));
 	$idletime = format_time((substr($output,strpos($output," ")))/$cpucores);
-
+	$pinStatus = trim(shell_exec("gpio -g read ".POWERONLINEPIN)); // Pin 18
+	//returns 0 = low; 1 = high
 ?>
 <div class="panel panel-default">
   <!-- Standard-Panel-Inhalt -->
@@ -104,6 +105,13 @@
 		<table id="sysinfo" class="table table-condensed">
 			<tbody>
 				<tr>
+					<?php
+					if (constant("SHOWPOWERSTATE")) {
+					?>
+					<th>Power</th>
+					<?php
+					}
+					?>
 					<?php
 					if ($cputemp !== NULL) {
 					?>
@@ -124,6 +132,13 @@
 					<th>Idle</th>
 				</tr>
 				<tr class="gatewayinfo">
+					<?php
+					if (constant("SHOWPOWERSTATE")) {
+					?>
+					<td><?php if ($pinStatus == POWERONLINESTATE ) {echo "online";} else {echo "on battery";} ?></td>
+					<?php
+					}
+					?>
 					<?php
 					if ($cputemp !== NULL) {
 					?>
diff --git a/setup.php b/setup.php
index 91f81dc..66e7a8b 100644
--- a/setup.php
+++ b/setup.php
@@ -149,6 +149,18 @@ include "include/tools.php";
         <span class="input-group-addon" id="HALTSYS" style="width: 300px">Halt system command:</span>
         <input type="text" value="<?php echo constant("HALTSYS") ?>" name="HALTSYS" class="form-control" placeholder="sudo halt" aria-describedby="HALTSYS">
       </div>	  
+      <div class="input-group">
+        <span class="input-group-addon" id="SHOWPOWERSTATE" style="width: 300px">Show Powerstate (online or battery, wiringpi needed)</span>
+        <div class="panel-body"><input type="checkbox" name="SHOWPOWERSTATE" <?php if (constant("SHOWPOWERSTATE")) echo "checked" ?>></div>
+      </div>
+      <div class="input-group">
+        <span class="input-group-addon" id="POWERONLINEPIN" style="width: 300px">GPIO pin to monitor:</span>
+        <input type="text" value="<?php echo constant("POWERONLINEPIN") ?>" name="POWERONLINEPIN" class="form-control" placeholder="18" aria-describedby="POWERONLINEPIN">
+      </div>
+      <div class="input-group">
+        <span class="input-group-addon" id="POWERONLINESTATE" style="width: 300px">State that signalizes online-state:</span>
+        <input type="text" value="<?php echo constant("POWERONLINESTATE") ?>" name="POWERONLINESTATE" class="form-control" placeholder="1" aria-describedby="POWERONLINESTATE">
+      </div>
       <div class="input-group">
       <span class="input-group-btn">
         <button class="btn btn-default" type="submit" form="config">Save configuration</button>