diff --git a/pathspider/plugins/dscpspider.py b/pathspider/plugins/dscpspider.py
new file mode 100644
index 0000000..82596ce
--- /dev/null
+++ b/pathspider/plugins/dscpspider.py
@@ -0,0 +1,172 @@
+
+import sys
+import logging
+import subprocess
+import traceback
+
+import socket
+import collections
+
+from pathspider.base import Spider
+from pathspider.base import NO_FLOW
+
+from pathspider.observer import Observer
+from pathspider.observer import basic_flow
+from pathspider.observer import basic_count
+
+Connection = collections.namedtuple("Connection", ["client", "port", "state"])
+SpiderRecord = collections.namedtuple("SpiderRecord", ["ip", "rport", "port",
+                                                       "host", "dscp",
+                                                       "connstate"])
+
+CONN_OK = 0
+CONN_FAILED = 1
+CONN_TIMEOUT = 2
+
+## Chain functions
+
+def tcp_setup(rec, ip):
+    rec['fin_count'] = 0
+    return True
+
+def tcp_complete(rec, tcp, rev): # pylint: disable=W0612,W0613
+    if tcp.fin_flag:
+        rec['fin_count'] += 1
+    return rec['fin_count'] < 2
+
+def dscp_setup(rec, ip):
+    rec['fwd_dscp'] = None
+    rec['rev_dscp'] = None
+    return True
+
+def dscp_extract(rec, ip, rev):
+    tos = ip.traffic_class
+    dscp = tos >> 2
+
+    if rev:
+        if rec['rev_dscp'] is None:
+            rec['rev_dscp'] = dscp
+    else:
+        if rec['fwd_dscp'] is None:
+            rec['fwd_dscp'] = dscp
+
+    return True
+
+## DSCPSpider main class
+
+class DSCPSpider(Spider):
+
+    def __init__(self, worker_count, libtrace_uri):
+        super().__init__(worker_count=worker_count,
+                         libtrace_uri=libtrace_uri)
+        self.dscp = None # set by configurator
+        self.conn_timeout = 10
+
+    def config_zero(self):
+        """
+        Disables DSCP marking via iptables.
+        """
+
+        logger = logging.getLogger('dscpsider')
+        for iptables in ['iptables', 'ip6tables']:
+            subprocess.check_call([iptables, '-t', 'mangle', '-F'])
+        logger.debug("Configurator disabled DSCP marking")
+
+    def config_one(self):
+        """
+        Enables DSCP marking via iptables.
+        """
+
+        logger = logging.getLogger('dscpsider')
+        for iptables in ['iptables', 'ip6tables']:
+            subprocess.check_call([iptables, '-t', 'mangle', '-A', 'OUTPUT',
+                '-p', 'tcp', '-m', 'tcp', '--dport', '80', '-j', 'DSCP',
+                '--set-dscp-class', 'ef'])
+        logger.debug("Configurator enabled DSCP marking")
+
+    def _connect(self, sock, job):
+        try:
+            sock.settimeout(self.conn_timeout)
+            sock.connect((job[0], job[1]))
+
+            return Connection(sock, sock.getsockname()[1], CONN_OK)
+        except TimeoutError:
+            return Connection(sock, sock.getsockname()[1], CONN_TIMEOUT)
+        except OSError:
+            return Connection(sock, sock.getsockname()[1], CONN_FAILED)
+
+    def connect(self, job, pcs, config):
+        """
+        Performs a TCP connection.
+        """
+
+        if ":" in job[0]:
+            sock = socket.socket(socket.AF_INET6)
+        else:
+            sock = socket.socket(socket.AF_INET)
+
+        conn = self._connect(sock, job)
+
+        try:
+            sock.shutdown(socket.SHUT_RDWR)
+            sock.close()
+        except:
+            pass
+
+        return conn
+
+
+    def post_connect(self, job, conn, pcs, config):
+        """
+        Create the SpiderRecord
+        """
+
+        if conn.state == CONN_OK:
+            rec = SpiderRecord(job[0], job[1], conn.port, job[2], config, True)
+        else:
+            rec = SpiderRecord(job[0], job[1], conn.port, job[2], config, False)
+
+        return rec
+
+    def create_observer(self):
+        """
+        Creates an observer with DSCP-related chain functions.
+        """
+
+        logger = logging.getLogger('dscpsider')
+        logger.info("Creating observer")
+        try:
+            return Observer(self.libtrace_uri,
+                            new_flow_chain=[basic_flow, tcp_setup, dscp_setup],
+                            ip4_chain=[basic_count, dscp_extract],
+                            ip6_chain=[basic_count, dscp_extract],
+                            tcp_chain=[tcp_complete])
+        except:
+            logger.error("Observer not cooperating, abandon ship")
+            traceback.print_exc()
+            sys.exit(-1)
+
+    def merge(self, flow, res):
+        """
+        Merge flow records.
+        
+        Includes the configuration and connection success or failure of the
+        socket connection with the flow record.
+        """
+
+        logger = logging.getLogger('dscpsider')
+        if flow == NO_FLOW:
+            flow = {"dip": res.ip,
+                    "sp": res.port,
+                    "dp": res.rport,
+                    "connstate": res.connstate,
+                    "dscp": res.dscp,
+                    "observed": False }
+        else:
+            flow['connstate'] = res.connstate
+            flow['dscp'] = res.dscp
+            flow['observed'] = True
+
+        logger.debug("Result: " + str(flow))
+        self.outqueue.put(flow)
+