diff --git a/tools/6502/Makefile b/tools/6502/Makefile
index 5007689b5..bc1b1a462 100644
--- a/tools/6502/Makefile
+++ b/tools/6502/Makefile
@@ -30,7 +30,7 @@
 #
 # Author: Oliver Schmidt <ol.sc@web.de>
 #
-# $Id: Makefile,v 1.8 2010/09/29 22:41:37 oliverschmidt Exp $
+# $Id: Makefile,v 1.9 2010/10/01 22:38:39 oliverschmidt Exp $
 #
 
 ifndef CC65_HOME
@@ -49,7 +49,10 @@ ifndef DIR2ATR
   ${error DIR2ATR not defined! You must specify where dir2atr resides}
 endif
 
-disks: apple2enh-1-disk apple2enh-2-disk apple2enh-3-disk c64-1-disk c64-2-disk c128-1-disk atari-1-disk atari-2-disk
+disks: apple2enh-1-disk apple2enh-2-disk apple2enh-3-disk \
+       c64-1-disk c64-2-disk \
+       c128-1-disk \
+       atari-1-disk atari-2-disk atari-3-disk
 
 apple2enh-1-disk:
 	cp ../apple2enh/prodos.dsk contiki-1.dsk
@@ -149,7 +152,6 @@ atari-1-disk:
 	cp ../../cpu/6502/dhcp/dhcp-client.atari            atr/dhcp.com
 	cp ../../examples/webserver/webserver-example.atari atr/webserve.com
 	cp ../../examples/webbrowser/webbrowser.atari       atr/webbrows.com
-	cp ../../examples/wget/wget.atari                   atr/wget.com
 	cp ../../examples/webserver/httpd-cfs/index.htm     atr/index.htm
 	cp ../../examples/webserver/httpd-cfs/backgrnd.gif  atr/backgrnd.gif
 	cp ../../examples/webserver/httpd-cfs/contiki.gif   atr/contiki.gif
@@ -158,13 +160,23 @@ atari-1-disk:
 	rm -r atr
 
 atari-2-disk:
+	mkdir -p atr
+	cp ../atari/dos.sys                      atr/dos.sys
+	cp ../atari/dup.sys                      atr/dup.sys
+	cp dummy.cfg                             atr/contiki.cfg
+	cp ../../cpu/6502/dhcp/dhcp-client.atari atr/dhcp.com
+	cp ../../examples/wget/wget.atari        atr/wget.com
+	cp ../../examples/irc/irc-client.atari   atr/irc.com
+	$(DIR2ATR) -b Dos25 1040 contiki-2.atr atr
+	rm -r atr
+
+atari-3-disk:
 	mkdir -p atr
 	cp ../atari/dos.sys                                                                     atr/dos.sys
 	cp ../atari/dup.sys                                                                     atr/dup.sys
 	cp dummy.cfg                                                                            atr/contiki.cfg
 	cp ../../cpu/6502/dhcp/dhcp-client.atari                                                atr/dhcp.com
-	cp ../../examples/irc/irc-client.atari                                                  atr/irc.com
 	cp ../../examples/email/email-client.atari                                              atr/email.com
-#	cp ../../../../contikiprojects/vandenbrande.com/twitter/platform/atari/breadbox64.atari atr/breadbox.com
-	$(DIR2ATR) -b Dos25 1040 contiki-2.atr atr
+	cp ../../../../contikiprojects/vandenbrande.com/twitter/platform/atari/breadbox64.atari atr/breadbox.com
+	$(DIR2ATR) -b Dos25 1040 contiki-3.atr atr
 	rm -r atr
diff --git a/tools/6502/contiki.html b/tools/6502/contiki.html
index 4c5784c37..15f56c56f 100644
--- a/tools/6502/contiki.html
+++ b/tools/6502/contiki.html
@@ -77,7 +77,7 @@
      <td colspan="3" />
     </tr><tr class="p">
      <td>
-      <input type="radio" name="machine" id="atari" value="atari" onclick="disks(2)" />
+      <input type="radio" name="machine" id="atari" value="atari" onclick="disks(3)" />
       <label for="atari">Atari 8-bit</label>
      </td><td colspan="2">
       <label for="atari-drv">Ethernet Card:</label>
diff --git a/tools/6502/download.php b/tools/6502/download.php
index b5e4f4ed7..d78ed5407 100644
--- a/tools/6502/download.php
+++ b/tools/6502/download.php
@@ -32,7 +32,7 @@ case 'atari':
     $hex = strtok($_GET['atari-addr-drv'], '-');
     $drv = strtok('-');
     $ext = '-' . $dsk . '.atr';
-    $blk = array(0, 5, 4, 0);
+    $blk = array(0, 5, 4, 272);
     $ofs = 0x00010 + ($blk[$dsk] - 1) * 0x80;
     break;
 }