diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1e140ee..248bfb6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -30,6 +30,7 @@ For major (breaking) changes - version 3 and 2 see end of page.
 
 | Version        | Date           | Comment  |
 | -------------- | -------------- | -------- |
+| 4.18.0         | 2020-01-07     | `networkInterfaces()` added dhcp for mac os, added dhcp linux fallback |
 | 4.17.3         | 2020-01-05     | code cleanup |
 | 4.17.2         | 2020-01-05     | `cpu().speed` AMD base frequency and fix (0.00) |
 | 4.17.1         | 2020-01-04     | `fsSize()` alpine linux support |
diff --git a/README.md b/README.md
index 972a540..bd683cd 100644
--- a/README.md
+++ b/README.md
@@ -447,7 +447,7 @@ I also created a nice little command line tool called [mmon][mmon-github-url]  (
 | | [0].duplex | X | | X | | | duplex |
 | | [0].mtu | X | | X | | | maximum transmission unit |
 | | [0].speed | X | | X | X | | speed in MBit / s |
-| | [0].dhcp | X | | | X | | DHCP address |
+| | [0].dhcp | X | | X | X | | IP address obtained by DHCP |
 | | [0].dnsSuffix | X | | | X | | DNS suffix |
 | | [0].ieee8021xAuth | X | | | X | | IEEE 802.1x auth |
 | | [0].ieee8021xState | X | | | X | | IEEE 802.1x state |
diff --git a/docs/history.html b/docs/history.html
index eb01a43..7c55791 100644
--- a/docs/history.html
+++ b/docs/history.html
@@ -83,6 +83,11 @@
                   </tr>
                 </thead>
                 <tbody>
+                  <tr>
+                    <th scope="row">4.18.0</th>
+                    <td>2020-01-07</td>
+                    <td><span class="code">networkInterfaces()</span> added dhcp for mac OS, added dhcp linux fallback</td>
+                  </tr>
                   <tr>
                     <th scope="row">4.17.3</th>
                     <td>2020-01-05</td>
@@ -106,7 +111,7 @@
                   <tr>
                     <th scope="row">4.16.1</th>
                     <td>2020-01-01</td>
-                    <td><span class="code">networkInterfaces()</span> bug fix (osx)</td>
+                    <td><span class="code">networkInterfaces()</span> bug fix (mac OS)</td>
                   </tr>
                   <tr>
                     <th scope="row">4.16.0</th>
@@ -231,7 +236,7 @@
                   <tr>
                     <th scope="row">4.13.1</th>
                     <td>2019-07-01</td>
-                    <td><span class="code">versions()</span> gcc fix macos</td>
+                    <td><span class="code">versions()</span> gcc fix mac OS</td>
                   </tr>
                   <tr>
                     <th scope="row">4.13.0</th>
@@ -246,7 +251,7 @@
                   <tr>
                     <th scope="row">4.12.1</th>
                     <td>2019-06-24</td>
-                    <td><span class="code">networkInterface()</span> virtual interfaces macos<br>
+                    <td><span class="code">networkInterface()</span> virtual interfaces mac OS<br>
                       <span class="code">networkInterfaceDefault()</span> optimization windows</td>
                   </tr>
                   <tr>
@@ -347,7 +352,7 @@
                   <tr>
                     <th scope="row">4.7.1</th>
                     <td>2019-05-29</td>
-                    <td><span class="code">memLayout()</span> fix macos mojave</td>
+                    <td><span class="code">memLayout()</span> fix mac OS mojave</td>
                   </tr>
                   <tr>
                     <th scope="row">4.7.0</th>
diff --git a/docs/index.html b/docs/index.html
index 2edf613..94eaba7 100644
--- a/docs/index.html
+++ b/docs/index.html
@@ -168,7 +168,7 @@
       <img class="logo" src="assets/logo.png">
       <div class="title">systeminformation</div>
       <div class="subtitle"><span id="typed"></span></div>
-      <div class="version">Current Version: <span id="version">4.17.3</span></div>
+      <div class="version">Current Version: <span id="version">4.18.0</span></div>
       <button class="btn btn-light" onclick="location.href='https://github.com/sebhildebrandt/systeminformation'">View on Github <i class=" fab fa-github"></i></button>
     </div>
     <div class="down">
@@ -191,7 +191,7 @@
     </div>
     <div class="row number-section">
       <div class="col-xl-4 col-lg-4 col-md-4 col-12">
-        <div class="numbers">9,756</div>
+        <div class="numbers">9,949</div>
         <div class="title">Lines of code</div>
       </div>
       <div class="col-xl-4 col-lg-4 col-md-4 col-12">
@@ -199,7 +199,7 @@
         <div class="title">Downloads last month</div>
       </div>
       <div class="col-xl-4 col-lg-4 col-md-4 col-12">
-        <div class="numbers">233</div>
+        <div class="numbers">234</div>
         <div class="title">Dependends</div>
       </div>
     </div>
diff --git a/docs/network.html b/docs/network.html
index e6dcdd7..c1443b1 100644
--- a/docs/network.html
+++ b/docs/network.html
@@ -200,10 +200,10 @@
                     <td>[0].dhcp</td>
                     <td>X</td>
                     <td></td>
-                    <td></td>
+                    <td>X</td>
                     <td>X</td>
                     <td></td>
-                    <td>DHCP address</td>
+                    <td>IP address obtained by DHCP</td>
                   </tr>
                   <tr>
                     <td></td>
diff --git a/lib/network.js b/lib/network.js
index abab9bf..f0b0673 100644
--- a/lib/network.js
+++ b/lib/network.js
@@ -503,7 +503,7 @@ function getLinuxDHCPNics() {
     lines.forEach(line => {
       const parts = line.replace(/\s+/g, ' ').trim().split(' ');
       if (parts.length >=4) {
-        if (line.toLowerCase().indexOf('dynamic') >= 0) {
+        if (line.toLowerCase().indexOf(' inet ') >= 0 && line.toLowerCase().indexOf('dhcp') >= 0) {
           result.push(parts[1]);
         }
       }
@@ -559,7 +559,7 @@ function getLinuxIfaceDHCPstatus(iface, connectionName, DHCPNics) {
       return (DHCPNics.indexOf(iface) >= 0);
     }
   } else {
-    return result;
+    return (DHCPNics.indexOf(iface) >= 0);
   }
 }