diff --git a/web/index.html b/web/index.html
index b2ca0d6..7c495ca 100644
--- a/web/index.html
+++ b/web/index.html
@@ -144,16 +144,14 @@ Here is an overview of the status of the various project elements:
     Finishing
     <TD><A href="http://projects.qi-hardware.com/index.php/p/ben-wpan/source/tree/master/atusb/fw">source</A>
   <TR><TH align="left">Device driver<TD bgcolor="#ffff00" align="center">
-    In progress
-    <TD><A href="http://sourceforge.net/apps/trac/linux-zigbee/">linux-zigbee project</A>,
-      <A href="https://github.com/wpwrak/ben-wpan-linux">ben-wpan kernel branch</A>
-      <!--<A href="http://projects.qi-hardware.com/index.php/p/qi-kernel/source/tree/ben-wpan/drivers/ieee802154">ben-wpan kernel branch</A>-->
+    Finishing
+    <TD><A href="https://git.kernel.org/cgit/linux/kernel/git/bluetooth/bluetooth-next.git/">mainlining through linux-wpan (bluetooh-next tree)</A>
   <TR><TH align="left">MAC layer<TD bgcolor="#ffff00" align="center">
     In progress
-    <TD><A href="http://sourceforge.net/apps/trac/linux-zigbee/">linux-zigbee project
+    <TD><A href="http://wpan.cakelab.org/">linux-wpan project
   <TR><TH align="left">IPv4 hack<TD bgcolor="#80ff80" align="center">Done
     <TD><A href="http://projects.qi-hardware.com/index.php/p/ben-wpan/source/tree/master/tools/dirtpan">dirtpan</A>
-  <TR><TH align="left">6LoWPAN stack<TD bgcolor="#ff8080" align="center">To do
+  <TR><TH align="left">6LoWPAN stack<TD bgcolor="#ffff00" align="center">In progress
 </TABLE>
 <P>
 
@@ -181,8 +179,9 @@ Shop links at Pulster:
 
 <P>
 <HR>
-Last update: 2013-05-07&nbsp;&nbsp;
-<A href="mailto:werner@almesberger.net"><I>Werner Almesberger</I></A>
+Last update: 2015-05-21&nbsp;&nbsp;
+<A href="mailto:werner@almesberger.net"><I>Werner Almesberger</I></A>, 
+<A href="mailto:stefan@datenfreihafen.org"><I>Stefan Schmidt</I></A>
 <HR>
 </BODY>
 </HTML>