diff --git a/README.md b/README.md
index c09a5ba..901df91 100644
--- a/README.md
+++ b/README.md
@@ -77,6 +77,13 @@ An example output may look like this:
     "score" : 100,
     "scoreType" : "success",
     "testDetails" : null
+  }, {
+    "name" : "SMB",
+    "hasError" : false,
+    "errorMessage" : null,
+    "score" : 100,
+    "scoreType" : "success",
+    "testDetails" : null
   }, {
     "name" : "TELNET",
     "hasError" : false,
@@ -84,6 +91,13 @@ An example output may look like this:
     "score" : 100,
     "scoreType" : "hidden",
     "testDetails" : null
+  }, {
+    "name" : "VNC",
+    "hasError" : false,
+    "errorMessage" : null,
+    "score" : 100,
+    "scoreType" : "hidden",
+    "testDetails" : null
   }]
 }
 ```
@@ -96,4 +110,6 @@ An example output may look like this:
 | RDP				                  | Checks if the port for RDP is open         |
 | MSSQL						          | Checks if the port for MS-SQL is open      |
 | MYSQL							      | Checks if the port for MY-SQL is open      |
+| SMB							      | Checks if the port for SMB is open         |
+| VNC							      | Checks if the port for VNC is open         |
 
diff --git a/src/main/java/de/rub/nds/siwecos/port/PortScannerCallback.java b/src/main/java/de/rub/nds/siwecos/port/PortScannerCallback.java
index a8c846e..26acbf2 100644
--- a/src/main/java/de/rub/nds/siwecos/port/PortScannerCallback.java
+++ b/src/main/java/de/rub/nds/siwecos/port/PortScannerCallback.java
@@ -120,6 +120,8 @@ public ScanResult reportToScanResult(PortScannerReport report) {
         resultList.add(getMySqlIsOpen(report));
         resultList.add(getRdpIsOpen(report));
         resultList.add(getTelnetIsOpen(report));
+        resultList.add(getVncIsOpen(report));
+        resultList.add(getSmbIsOpen(report));
 
         int max = 100;
         boolean hasError = false;
@@ -195,4 +197,14 @@ private TestResult getIrcIsOpen(PortScannerReport report) {
         return new TestResult("IRC", report.getIrcIsOpen() == null, null, report.getIrcIsOpen() == Boolean.TRUE ? 0
                 : 100, !(report.getIrcIsOpen() == Boolean.TRUE) ? "success" : "warning", null);
     }
+
+    private TestResult getVncIsOpen(PortScannerReport report) {
+        return new TestResult("VNC", report.getVncIsOpen() == null, null, report.getVncIsOpen() == Boolean.TRUE ? 0
+                : 100, !(report.getVncIsOpen() == Boolean.TRUE) ? "success" : "warning", null);
+    }
+
+    private TestResult getSmbIsOpen(PortScannerReport report) {
+        return new TestResult("SMB", report.getSmbIsOpen() == null, null, report.getSmbIsOpen() == Boolean.TRUE ? 0
+                : 100, !(report.getSmbIsOpen() == Boolean.TRUE) ? "success" : "warning", null);
+    }
 }
diff --git a/src/main/java/de/rub/nds/siwecos/port/scanner/PortScanner.java b/src/main/java/de/rub/nds/siwecos/port/scanner/PortScanner.java
index 3046d75..1bf0a5e 100644
--- a/src/main/java/de/rub/nds/siwecos/port/scanner/PortScanner.java
+++ b/src/main/java/de/rub/nds/siwecos/port/scanner/PortScanner.java
@@ -132,6 +132,9 @@ private void adjustReport(PortScannerReport portScannerReport) {
                     case 194:
                         portScannerReport.setIrcIsOpen(true);
                         break;
+                    case 445:
+                        portScannerReport.setSmbIsOpen(true);
+                        break;
                     case 1433:
                         portScannerReport.setMsSqlIsOpen(true);
                         break;
@@ -141,6 +144,10 @@ private void adjustReport(PortScannerReport portScannerReport) {
                     case 3389:
                         portScannerReport.setRdpIsOpen(true);
                         break;
+                    case 5800:
+                    case 5900:
+                        portScannerReport.setVncIsOpen(true);
+                        break;
                     case 80: // HTTP
                     case 443: // HTTPS
                     case 22: // SSH
diff --git a/src/main/java/de/rub/nds/siwecos/port/scanner/PortScannerReport.java b/src/main/java/de/rub/nds/siwecos/port/scanner/PortScannerReport.java
index 313a69f..3bd8022 100644
--- a/src/main/java/de/rub/nds/siwecos/port/scanner/PortScannerReport.java
+++ b/src/main/java/de/rub/nds/siwecos/port/scanner/PortScannerReport.java
@@ -32,6 +32,8 @@ public class PortScannerReport {
     private Boolean rdpIsOpen = false;
     private Boolean msSqlIsOpen = false;
     private Boolean ircIsOpen = false;
+    private Boolean vncIsOpen = false;
+    private Boolean smbIsOpen = false;
 
     private List<PortResult> questionableResultList;
 
@@ -114,4 +116,21 @@ public Boolean getIrcIsOpen() {
     public void setIrcIsOpen(Boolean ircIsOpen) {
         this.ircIsOpen = ircIsOpen;
     }
+	
+    public Boolean getVncIsOpen() {
+        return VncIsOpen;
+    }
+
+    public void setVncIsOpen(Boolean VncIsOpen) {
+        this.VncIsOpen = VncIsOpen;
+    }
+
+    public Boolean getSmbIsOpen() {
+        return SmbIsOpen;
+    }
+
+    public void setSmbIsOpen(Boolean SmbIsOpen) {
+        this.SmbIsOpen = SmbIsOpen;
+    }
+	
 }