diff --git a/tools/cooja/java/se/sics/cooja/plugins/analyzers/IEEE802154Analyzer.java b/tools/cooja/java/se/sics/cooja/plugins/analyzers/IEEE802154Analyzer.java
new file mode 100644
index 000000000..9a8f19a10
--- /dev/null
+++ b/tools/cooja/java/se/sics/cooja/plugins/analyzers/IEEE802154Analyzer.java
@@ -0,0 +1,133 @@
+package se.sics.cooja.plugins.analyzers;
+
+import se.sics.cooja.util.StringUtils;
+
+public class IEEE802154Analyzer extends PacketAnalyzer {
+
+    /* TODO: fix this to be correct */
+    public static final int NO_ADDRESS = 0;
+    public static final int RSV_ADDRESS = 1;
+    public static final int SHORT_ADDRESS = 2;
+    public static final int LONG_ADDRESS = 3;
+
+    public static final int BEACONFRAME = 0x00;
+    public static final int DATAFRAME = 0x01;
+    public static final int ACKFRAME = 0x02;
+    public static final int CMDFRAME = 0x03;
+
+    private static final byte[] BROADCAST_ADDR = {(byte)0xff, (byte)0xff};
+
+    private static final String[] typeS = {"-", "D", "A"};
+    private static final String[] typeVerbose = {"Beacon", "Data", "Ack"};
+
+    private int defaultAddressMode = LONG_ADDRESS;
+    private byte seqNo = 0;
+
+    private int myPanID = 0xabcd;
+
+
+    public boolean matchPacket(Packet packet) {
+        return packet.level == MAC_LEVEL;
+    }
+
+/* we need better model of this later... */
+    public boolean matchPacket(byte[] packet, int level) {
+        return false;
+    }
+    
+    /* this protocol always have network level packets as payload */
+    public int nextLevel(byte[] packet, int level) {
+        return NETWORK_LEVEL;
+    }
+    /* create a 802.15.4 packet of the bytes and "dispatch" to the
+     * next handler
+     */
+    public void analyzePacket(Packet packet, StringBuffer brief, StringBuffer verbose) {
+        int pos = packet.pos;
+        int type = packet.data[pos + 0] & 7;
+        int security = (packet.data[pos + 0] >> 3) & 1;
+        int pending = (packet.data[pos + 0] >> 4) & 1;
+        int ackRequired = (packet.data[pos + 0] >> 5) & 1;
+        int panCompression  = (packet.data[pos + 0]>> 6) & 1;
+        int destAddrMode = (packet.data[pos + 1] >> 2) & 3;
+        int frameVersion = (packet.data[pos + 1] >> 4) & 3;
+        int srcAddrMode = (packet.data[pos + 1] >> 6) & 3;
+        int seqNumber = packet.data[pos + 2];
+        int destPanID = 0;
+        int srcPanID = 0;
+        byte[] sourceAddress = null;
+        byte[] destAddress = null;
+
+        pos += 3;
+
+        if (destAddrMode > 0) {
+            destPanID = (packet.data[pos] & 0xff) + ((packet.data[pos + 1] & 0xff) << 8);
+            pos += 2;
+            if (destAddrMode == SHORT_ADDRESS) {
+                destAddress = new byte[2];
+                destAddress[1] = packet.data[pos];
+                destAddress[0] = packet.data[pos + 1];
+                pos += 2;
+            } else if (destAddrMode == LONG_ADDRESS) {
+                destAddress = new byte[8];
+                for (int i = 0; i < 8; i++) {
+                    destAddress[i] = packet.data[pos + 7 - i];
+                }
+                pos += 8;
+            }
+        }
+
+        if (srcAddrMode > 0) {
+            if (panCompression == 0){
+                srcPanID = (packet.data[pos] & 0xff) + ((packet.data[pos + 1] & 0xff) << 8);
+                pos += 2;
+            } else {
+                srcPanID = destPanID;
+            }
+            if (srcAddrMode == SHORT_ADDRESS) {
+                sourceAddress = new byte[2];
+                sourceAddress[1] = packet.data[pos];
+                sourceAddress[0] = packet.data[pos + 1];
+                pos += 2;
+            } else if (srcAddrMode == LONG_ADDRESS) {
+                sourceAddress = new byte[8];
+                for (int i = 0; i < 8; i++) {
+                    sourceAddress[i] = packet.data[pos + 7 - i];
+                }
+                pos += 8;
+            }
+        }
+
+        int payloadLen = packet.data.length - pos;
+
+        brief.append("15.4 ");
+        brief.append(typeS[type]).append(' ');
+        printAddress(brief, srcAddrMode, sourceAddress);
+        brief.append(" ");
+        printAddress(brief, destAddrMode, destAddress);
+
+
+        verbose.append("<html><b>IEEE 802.15.4</b><br>from ");
+        printAddress(verbose, srcAddrMode, sourceAddress);
+        verbose.append(" to ");
+        printAddress(verbose, destAddrMode, destAddress);
+        verbose.append("<br>FrameType: : " + typeVerbose[type]);
+        verbose.append("<br>Payload len: " + payloadLen);
+        verbose.append("<br>");
+
+        /* update packet */
+        packet.pos = pos;
+        packet.level = NETWORK_LEVEL;
+    }
+
+    private void printAddress(StringBuffer sb, int type, byte[] addr) {
+        if (type == SHORT_ADDRESS) {
+            sb.append(StringUtils.toHex(addr));
+        } else if (type == LONG_ADDRESS) {
+            sb.append(StringUtils.toHex(addr[0]) + StringUtils.toHex(addr[1]) + ":" + 
+                    StringUtils.toHex(addr[2]) + StringUtils.toHex(addr[3]) + ":" +
+                    StringUtils.toHex(addr[4]) + StringUtils.toHex(addr[5]) + ":" +
+                    StringUtils.toHex(addr[6]) + StringUtils.toHex(addr[7]));
+        }
+    }
+}
diff --git a/tools/cooja/java/se/sics/cooja/plugins/analyzers/IPHCPacketAnalyzer.java b/tools/cooja/java/se/sics/cooja/plugins/analyzers/IPHCPacketAnalyzer.java
new file mode 100644
index 000000000..f3fe21ccf
--- /dev/null
+++ b/tools/cooja/java/se/sics/cooja/plugins/analyzers/IPHCPacketAnalyzer.java
@@ -0,0 +1,51 @@
+package se.sics.cooja.plugins.analyzers;
+
+import se.sics.cooja.util.StringUtils;
+
+public class IPHCPacketAnalyzer extends PacketAnalyzer {
+
+    private static final int IPHC_DISPATCH = 0x60;
+    
+    public boolean matchPacket(Packet packet) {
+        return (packet.get(0) & 0xe0) == IPHC_DISPATCH;
+    }
+
+    public void analyzePacket(Packet packet, StringBuffer brief,
+            StringBuffer verbose) {
+
+        int tf = (packet.get(0) >> 3) & 0x03;
+        int nh = (packet.get(0) >> 2) & 0x01;
+        int hlim = (packet.get(0) & 0x03);
+        int cid = (packet.get(1) >> 7) & 0x01;
+        int sac = (packet.get(1) >> 6) & 0x01;
+        int sam = (packet.get(1) >> 4) & 0x03;
+        int m = (packet.get(1) >> 3) & 0x01;
+        int dac = (packet.get(1) >> 2) & 0x01;
+        int dam = packet.get(1) & 0x03;
+
+        brief.append("iphc tf=" + tf + (nh == 1 ? " nh" : "") + " hl=" + hlim + (cid == 1 ? " cid " : ""));
+        brief.append((sac == 1 ? " sac" : "") + " sam=" + sam + (m == 1 ? " M" : "") +
+                (dac == 1 ? " dac" : " -") + " dam=" + dam);
+
+        if (cid == 1) {
+            brief.append(" sci=" + (packet.get(2) >> 4) + " dci=" + (packet.get(2) & 0x0f));
+        }
+        /* need to decompress while analyzing - add that later... */
+        
+        verbose.append("<br><b>IPHC HC-06</b><br>");
+        verbose.append("tf = " + tf + " nhc = " + nh + " hlim = " + hlim + " cid = " + cid);
+        verbose.append("sac = " + sac + " sam = " + sam + " MCast = " + m + " dac = " + dac +
+        " dam = " + dam + "<br>");
+        if (cid == 1) {
+            verbose.append("Contexts: sci=" + (packet.get(2) >> 4) + " dci=" + (packet.get(2) & 0x0f));
+        }
+
+        packet.pos += cid == 1 ? 3 : 2;
+        brief.append("|").append(StringUtils.toHex(packet.getPayload(), 4));
+        verbose.append("Payload: ").append(StringUtils.toHex(packet.getPayload(), 4));
+        
+        packet.pos = packet.data.length;
+        packet.level = NETWORK_LEVEL;
+    }
+
+}
diff --git a/tools/cooja/java/se/sics/cooja/plugins/analyzers/PacketAnalyzer.java b/tools/cooja/java/se/sics/cooja/plugins/analyzers/PacketAnalyzer.java
new file mode 100644
index 000000000..5f95403e1
--- /dev/null
+++ b/tools/cooja/java/se/sics/cooja/plugins/analyzers/PacketAnalyzer.java
@@ -0,0 +1,37 @@
+package se.sics.cooja.plugins.analyzers;
+
+public abstract class PacketAnalyzer {
+
+    public static final int RADIO_LEVEL = 0;
+    public static final int MAC_LEVEL = 1;
+    public static final int NETWORK_LEVEL = 2;
+    
+    public static class Packet {
+        byte[] data;
+        int pos;
+        int level;
+
+        public Packet(byte[] data, int level) {
+            this.level = level;
+            this.data = data;
+        }
+
+        public boolean hasMoreData() {
+            return data.length > pos;
+        }
+        
+        public byte get(int index) {
+            return data[pos + index];
+        }
+        
+        public byte[] getPayload() {
+            byte[] pload = new byte[data.length - pos];
+            System.arraycopy(data, pos, pload, 0, pload.length);
+            return pload;
+        }
+    };
+    
+    public abstract boolean matchPacket(Packet packet);
+    
+    public abstract void analyzePacket(Packet packet, StringBuffer brief, StringBuffer verbose);
+}
\ No newline at end of file