diff --git a/fhem/CHANGED b/fhem/CHANGED
index a44aa800e..988080a17 100644
--- a/fhem/CHANGED
+++ b/fhem/CHANGED
@@ -1,5 +1,6 @@
 # Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
 # Do not insert empty lines here, update check depends on it.
+  - change:  12_HProtocolGateway: move sensorSystem attribute to HProtocolTank
   - feature: 98_Verkehrsinfo.pm: add attribut timeout
   - feature: 12_HProtocolGateway: added 843 protocol for PMS-IB P20
   - feature: 12_HProtocolTank: added Product to calculate 15 degrees volume
diff --git a/fhem/FHEM/12_HProtocolGateway.pm b/fhem/FHEM/12_HProtocolGateway.pm
index e00674f93..53d0eb91e 100644
--- a/fhem/FHEM/12_HProtocolGateway.pm
+++ b/fhem/FHEM/12_HProtocolGateway.pm
@@ -50,8 +50,7 @@ sub HProtocolGateway_Initialize($) {
                       "databitsLength:5,6,7,8 " .
                       "stopBit:0,1 " .
                       "pollIntervalMins " .
-                      "path " .
-                      "sensorSystem:Hectronic,Unitronics,PMS-IB";
+                      "path";
 }
 
 sub HProtocolGateway_Define($$) {
@@ -116,7 +115,7 @@ sub HProtocolGateway_GetUpdate($) {
       $command = "\$C";
     }
     
-    my $sensorSystem = AttrVal($name, 'sensorSystem', ""); 
+    my $sensorSystem = AttrVal($tankHash->{NAME}, 'sensorSystem', ""); 
     if ( $sensorSystem eq "PMS-IB") {
       $command = "H";
     }
@@ -188,7 +187,7 @@ sub HProtocolGateway_ParseMessage($$) {
     my ($hash, $data, $tankHash) = @_;
     my $name = $hash->{NAME};
 
-    my $sensorSystem = AttrVal($name, 'sensorSystem', ""); 
+    my $sensorSystem = AttrVal($tankHash->{NAME}, 'sensorSystem', ""); 
     
     my ($tanknumber,$error,$temperature,$tankdata,$water,$checksum,$version,$probe_offset);
 
@@ -432,7 +431,6 @@ sub HProtocolGateway_Tank($$$) {
   <b>Define</b>
   <ul>
     <code>define &lt;name&gt; HProtocolGateway /dev/tty???<br />
-    attr &lt;name&gt; sensorSystem Hectronic<br />
     attr &lt;name&gt; pollIntervalMins 2<br />
     attr &lt;name&gt; path /opt/fhem/<br />
     attr &lt;name&gt; baudrate 1200<br />
@@ -465,8 +463,6 @@ sub HProtocolGateway_Tank($$$) {
   <a name="HProtocolGateway"></a>
   <b>Attributes</b>
   <ul>
-    <li>sensorSystem<br />
-    Sensor System / Hectronic, Unitronics, PMS-IB</li>
     <li>pollIntervalMins<br />
     poll Interval in Mins</li>
     <li>path<br />
diff --git a/fhem/FHEM/12_HProtocolTank.pm b/fhem/FHEM/12_HProtocolTank.pm
index 69104700f..1c1f0f49b 100644
--- a/fhem/FHEM/12_HProtocolTank.pm
+++ b/fhem/FHEM/12_HProtocolTank.pm
@@ -37,6 +37,7 @@ sub HProtocolTank_Initialize($) {
                             "mode:FillLevel,Volume,Ullage " .
                             "type " .
                             "product:Diesel,FuelOil,Petrol " .
+                            "sensorSystem:Hectronic,Unitronics,PMS-IB " .
                             $readingFnAttributes;
 }
 
@@ -129,6 +130,7 @@ sub HProtocolTank_Attr (@) {
 
     <code>define &lt;name&gt; HProtocolTank HProtocolGateway<br />
     attr &lt;name&gt; hID 01<br />
+    attr &lt;name&gt; sensorSystem Hectronic<br />
     attr &lt;name&gt; product FuelOil<br />
     </code>
     <br />
@@ -165,6 +167,8 @@ sub HProtocolTank_Attr (@) {
   <ul>
     <li>hID<br />
     01 - 32 Tank Number / Tank Address (99 for testing only)</li>
+    <li>sensorSystem<br />
+    Sensor System / Hectronic, Unitronics, PMS-IB</li>
     <li>mode<br />
     Mode / FillLevel, Volume, Ullage</li>
     <li>type<br />