diff --git a/Makefile b/Makefile
index eed71a7..7da12ca 100644
--- a/Makefile
+++ b/Makefile
@@ -68,7 +68,7 @@ CPUTEST := tests/cputest.firmware
 SCRIPTS := ${addprefix scripts/,autorun.sc duty.sc}
 BINARY := README.txt license.txt CHANGE_LOG.txt images/*.jpg firmware/*/*.firmware ${SCRIPTS}
 
-PACKAGES := se/sics/mspsim ${addprefix se/sics/mspsim/,core platform platform/esb platform/sky cli ui util chip extutil/highlight extutil/jfreechart}
+PACKAGES := se/sics/mspsim ${addprefix se/sics/mspsim/,core platform platform/esb platform/sky cli ui util chip net extutil/highlight extutil/jfreechart}
 
 SOURCES := ${wildcard *.java $(addsuffix /*.java,$(PACKAGES))}
 
diff --git a/se/sics/mspsim/chip/DS2411.java b/se/sics/mspsim/chip/DS2411.java
index 1615cf7..1f5a001 100644
--- a/se/sics/mspsim/chip/DS2411.java
+++ b/se/sics/mspsim/chip/DS2411.java
@@ -71,7 +71,7 @@ public class DS2411 extends Chip {
   private int writePos = 0;
   /* max 10 bytes to write back */
   private int[] writeBuf = new int[10];
-  private int[] macID = new int[]{0, 1, 2, 3, 4, 5};
+  private int[] macID = new int[]{1, 2, 3, 4, 5, 6};
   
   private TimeEvent stateEvent = new TimeEvent(0) {
     public void execute(long t) {
diff --git a/se/sics/mspsim/net/HC01PacketHandler.java b/se/sics/mspsim/net/HC01PacketHandler.java
index c584ff0..caa8933 100644
--- a/se/sics/mspsim/net/HC01PacketHandler.java
+++ b/se/sics/mspsim/net/HC01PacketHandler.java
@@ -197,6 +197,8 @@ public class HC01PacketHandler extends AbstractPacketHandler {
       /* infer IID from L2 address */
       byte[] linkAddress = getLinkSourceAddress(packet);
       System.arraycopy(linkAddress, 0, packet.sourceAddress, 8, 8);
+      /* TODO: clean autoconf stuff up */
+      packet.sourceAddress[8] ^= 0x02;
       break;
     case IPHC_SAM_16:
       if((data[pos] & 0x80) == 0) {
@@ -254,6 +256,8 @@ public class HC01PacketHandler extends AbstractPacketHandler {
       /* figure out a way to pick this up from link-layer !!! */
       byte[] destAddress = getLinkDestinationAddress(packet);
       System.arraycopy(destAddress, 0, packet.destAddress, 8, 8);
+      /* cleanup autoconf stuff later ... */
+      packet.destAddress[8] ^= 0x02;
       break;
     case IPHC_DAM_16:
       if((data[pos] & 0x80) == 0) {