diff --git a/Makefile b/Makefile
index 7ae141b..68d7db2 100644
--- a/Makefile
+++ b/Makefile
@@ -69,7 +69,7 @@
 
 # If you have a "pristine" source directory, point CONFIG_SRC_DIR to it.
 # Experimental and incomplete; tell the mailing list
-# <busybox@opensource.lineo.com> if you do or don't like it so far.
+# <busybox@busybox.net> if you do or don't like it so far.
 CONFIG_SRC_DIR =
 
 # If you are running a cross compiler, you may want to set CROSS
@@ -249,15 +249,15 @@
 	- pod2man --center=BusyBox --release="version $(VERSION)" \
 		$< > $@
 
-docs/BusyBox.html: docs/busybox.lineo.com/BusyBox.html
+docs/BusyBox.html: docs/busybox.net/BusyBox.html
 	- mkdir -p docs
 	-@ rm -f docs/BusyBox.html
-	-@ ln -s busybox.lineo.com/BusyBox.html docs/BusyBox.html
+	-@ ln -s busybox.net/BusyBox.html docs/BusyBox.html
 
-docs/busybox.lineo.com/BusyBox.html: docs/busybox.pod
-	-@ mkdir -p docs/busybox.lineo.com
+docs/busybox.net/BusyBox.html: docs/busybox.pod
+	-@ mkdir -p docs/busybox.net
 	-  pod2html --noindex $< > \
-	    docs/busybox.lineo.com/BusyBox.html
+	    docs/busybox.net/BusyBox.html
 	-@ rm -f pod2htm*
 
 
@@ -285,7 +285,7 @@
 
 docs/busybox/busyboxdocumentation.html: docs/busybox.sgml
 	- mkdir -p docs
-	(cd docs/busybox.lineo.com; sgmltools -b html ../busybox.sgml)
+	(cd docs/busybox.net; sgmltools -b html ../busybox.sgml)
 
 # The nifty new buildsystem stuff
 scripts/mkdep: scripts/mkdep.c
@@ -369,9 +369,9 @@
 	- $(MAKE) -C tests clean
 	- $(MAKE) -C scripts/lxdialog clean
 	- rm -f docs/BusyBox.txt docs/BusyBox.1 docs/BusyBox.html \
-	    docs/busybox.lineo.com/BusyBox.html
+	    docs/busybox.net/BusyBox.html
 	- rm -f docs/busybox.txt docs/busybox.dvi docs/busybox.ps \
-	    docs/busybox.pdf docs/busybox.lineo.com/busybox.html \
+	    docs/busybox.pdf docs/busybox.net/busybox.html \
 	    docs/busybox _install pod2htm* *.gdb *.elf *~ core
 	- rm -f busybox.links libbb/loop.h .config.old .hdepend
 	- rm -f scripts/split-include scripts/mkdep .*config.log
diff --git a/README b/README
index 608a316..bfcf4e2 100644
--- a/README
+++ b/README
@@ -83,7 +83,7 @@
 Getting help:
 
 When you find you need help, you can check out the BusyBox mailing list
-archives at http://oss.lineo.com/lists/busybox/ or even join
+archives at http://busybox.net/lists/busybox/ or even join
 the mailing list if you are interested.
 
 ----------------
@@ -131,13 +131,13 @@
 CVS:
 
 BusyBox now has its own publicly browsable CVS tree at:
-    http://oss.lineo.com/cgi-bin/cvsweb/busybox/
+    http://busybox.net/cgi-bin/cvsweb/busybox/
 
 Anonymous CVS access is available.  For instructions, check out:
-    http://oss.lineo.com/cvs_anon.html
+    http://busybox.net/cvs_anon.html
 
 For those that are actively contributing there is even CVS write access:
-    http://oss.lineo.com/cvs_write.html
+    http://busybox.net/cvs_write.html
 
 ----------------
 
diff --git a/debian/copyright b/debian/copyright
index 68a96e6..9a51d73 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Erik Andersen <andersee@debian.org> on
 Sun, 18 Jun 2000 23:31:02 -0600
 
-It was downloaded from ftp://ftp.lineo.com/pub/busybox
-HomePage is at: http://busybox.lineo.com/
+It was downloaded from ftp://ftp.busybox.net/busybox
+HomePage is at: http://busybox.net/
 
 Copyright: GPL
diff --git a/debian/rules b/debian/rules
index 45a6c60..a841536 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,8 +42,8 @@
 	#(cd $(bbbd); $(MAKE) "CONFIG_SRC_DIR=../../" "PREFIX=../../$(bb)" install)
 	mkdir -p $(bb)/bin/
 	cp $(bbbd)/busybox $(bb)/bin/busybox
-	mkdir -p $(bb)/usr/share/doc/busybox/busybox.lineo.com
-	cp $(bbbd)/docs/busybox.lineo.com/BusyBox.html $(bb)/usr/share/doc/busybox/busybox.lineo.com/
+	mkdir -p $(bb)/usr/share/doc/busybox/busybox.net
+	cp $(bbbd)/docs/busybox.net/BusyBox.html $(bb)/usr/share/doc/busybox/busybox.net/
 	mkdir -p $(bb)/usr/share/man/man1
 	cp $(bbbd)/docs/BusyBox.1 $(bb)/usr/share/man/man1/busybox.1
 
@@ -67,8 +67,8 @@
 	#(cd $(bbsbd); $(MAKE) "CONFIG_SRC_DIR=../../" "PREFIX=../../$(bbs)" install)
 	mkdir -p $(bbs)/bin/
 	cp $(bbsbd)/busybox $(bbs)/bin/busybox
-	mkdir -p $(bbs)/usr/share/doc/busybox-static/busybox.lineo.com
-	cp $(bbsbd)/docs/busybox.lineo.com/BusyBox.html $(bbs)/usr/share/doc/busybox-static/busybox.lineo.com/
+	mkdir -p $(bbs)/usr/share/doc/busybox-static/busybox.net
+	cp $(bbsbd)/docs/busybox.net/BusyBox.html $(bbs)/usr/share/doc/busybox-static/busybox.net/
 	mkdir -p $(bbs)/usr/share/man/man1/
 	cp $(bbsbd)/docs/BusyBox.1 $(bbs)/usr/share/man/man1/busybox.1
 
@@ -130,7 +130,7 @@
 	dh_installdirs
 	dh_installdocs       -p$@  $(bbbd)/docs/BusyBox.txt \
 		$(bbbd)/docs/BusyBox.html docs/style-guide.txt \
-		docs/busybox.lineo.com AUTHORS README TODO
+		docs/busybox.net AUTHORS README TODO
 	rm -rf `find $(bb) -name CVS`
 	rm -f `find $(bb) -name .cvsignore`
 	dh_installchangelogs -p$@ Changelog
@@ -152,7 +152,7 @@
 	dh_installdirs
 	dh_installdocs       -p$@  $(bbsbd)/docs/BusyBox.txt \
 		$(bbsbd)/docs/BusyBox.html docs/style-guide.txt \
-		docs/busybox.lineo.com AUTHORS README TODO
+		docs/busybox.net AUTHORS README TODO
 	rm -rf `find $(bbs) -name CVS`
 	rm -f `find $(bbs) -name .cvsignore`
 	dh_installchangelogs -p$@ Changelog
diff --git a/docs/busybox.net/index.html b/docs/busybox.net/index.html
index edb1966..a632a5e 100644
--- a/docs/busybox.net/index.html
+++ b/docs/busybox.net/index.html
@@ -62,8 +62,8 @@
 
 
 <H3>Mailing List Information</h3>
-BusyBox now has a <a href="http://opensource.lineo.com/lists/busybox/">mailing list</a>!
-To subscribe, go and visit <a href="http://opensource.lineo.com/mailman/listinfo/busybox">this page</a>.
+BusyBox now has a <a href="http://busybox.net/lists/busybox/">mailing list</a>!
+To subscribe, go and visit <a href="http://busybox.net/mailman/listinfo/busybox">this page</a>.
 
 <!-- Begin Latest News section -->
 
@@ -94,12 +94,12 @@
     I've personally tested this release out
     on x86, ARM, and powerpc using glibc 2.2.4, libc5, and uClibc, so
     it should work with just about any Linux system you throw it at.  
-    See the <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a> 
+    See the <a href="ftp://busybox.net/busybox/Changelog">changelog</a> 
     for <small>most of</small> the details.  The last release was
     <em>very</em> solid for people, and this one should be even better.
     <p>
     As usual BusyBox 0.60.2 can be downloaded from 
-	     <a href="ftp://oss.lineo.com/busybox">ftp://oss.lineo.com/busybox</a>.
+	     <a href="ftp://busybox.net/busybox">ftp://busybox.net/busybox</a>.
     <p>
     And please read the news item for the 18th as well.  Have Fun.<br> -Erik
     <p>
@@ -113,7 +113,7 @@
 	<input type="hidden" name="cmd" value="_xclick">
 	<input type="hidden" name="business" value="andersen@codepoet.org">
 	<input type="hidden" name="item_name" value="Support Busybox/Buy busybox.net">
-	<input type="hidden" name="image_url" value="https://opensource.lineo.com/images/busybox2.jpg">
+	<input type="hidden" name="image_url" value="https://busybox.net/images/busybox2.jpg">
 	<input type="hidden" name="no_shipping" value="1">
 	<input type="image" src="images/donate.png" border="0" name="submit" alt="Make donation using PayPal">
     </form>
@@ -164,9 +164,9 @@
 	     here it is.  Come and get it.
 	     <p>
 	     The 
-	     <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a> has all
+	     <a href="ftp://busybox.net/busybox/Changelog">changelog</a> has all
 	     the details.  As usual BusyBox 0.60.1 can be downloaded from 
-	     <a href="ftp://oss.lineo.com/busybox">ftp://oss.lineo.com/busybox</a>.
+	     <a href="ftp://busybox.net/busybox">ftp://busybox.net/busybox</a>.
 	     <p>Have Fun!
 	     <p>
 
@@ -188,11 +188,11 @@
 	     Those wanting an easy way to test the 0.60.0 release with uClibc can 
 	     use <a href="http://user-mode-linux.sourceforge.net/">User-Mode Linux</a>
 	     to give it a try by downloading and compiling 
-	     <a href="ftp://oss.lineo.com/buildroot.tar.gz">buildroot.tar.gz</a>.
+	     <a href="ftp://busybox.net/buildroot.tar.gz">buildroot.tar.gz</a>.
 	     You don't have to be root or reboot your machine to run test this way.
-	     Preconfigured User-Mode Linux kernel source is also on oss.lineo.com. 
+	     Preconfigured User-Mode Linux kernel source is also on busybox.net.
 	     <p>
-	     Another cool thing is the nifty <a href="ftp://oss.lineo.com/busybox/tutorial/index.html">
+	     Another cool thing is the nifty <a href="ftp://busybox.net/busybox/tutorial/index.html">
 	     BusyBox Tutorial</a> contributed by K Computing.  This requires 
 	     a ShockWave plugin (or standalone viewer), so you may want to grab the 
 	     the GPLed shockwave viewer from <a href="http://www.swift-tools.com/Flash/flash-0.4.10.tgz">here</a>
@@ -217,9 +217,9 @@
 
 	     <p>
 	     The 
-	     <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a> has all
+	     <a href="ftp://busybox.net/busybox/Changelog">changelog</a> has all
 	     the details.  As usual BusyBox 0.60.0 can be downloaded from 
-	     <a href="ftp://oss.lineo.com/busybox">ftp://oss.lineo.com/busybox</a>.
+	     <a href="ftp://busybox.net/busybox">ftp://busybox.net/busybox</a>.
 	     <p>Have Fun!
 	     <p>
 
@@ -236,11 +236,11 @@
 
 	     <p>
 	     The 
-	     <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a> covers 
+	     <a href="ftp://busybox.net/busybox/Changelog">changelog</a> covers 
 	     some of the more obvious details, but there are many many things that
 	     are not mentioned, but have been improved in subtle ways.  As usual,
 	     BusyBox 0.52 can be downloaded from 
-	     <a href="ftp://oss.lineo.com/busybox">ftp://oss.lineo.com/busybox</a>.
+	     <a href="ftp://busybox.net/busybox">ftp://busybox.net/busybox</a>.
 	     <p>Have Fun!
 	     <p>
 
@@ -260,7 +260,7 @@
 
     <li> <b>Old News</b>
     <br>
-	     For the old news, visit <a href="http://busybox.lineo.com/oldnews.html">the old news page</a>.
+	     For the old news, visit <a href="http://busybox.net/oldnews.html">the old news page</a>.
 </ul>
 
 
@@ -275,17 +275,17 @@
 <ul>
 
 	<li> Source for the latest release can always be downloaded from 
-	<a href="ftp://oss.lineo.com/busybox">ftp://oss.lineo.com/busybox</a>.
+	<a href="ftp://busybox.net/busybox">ftp://busybox.net/busybox</a>.
 
 	<li> A new snapshot of the source is made daily and is available as a GNU
 	gzipped tarball <a href="busybox.tar.gz"> right here</a>.
 
 	<li> BusyBox now has its own publically browsable
-	<a href="http://opensource.lineo.com/cgi-bin/cvsweb/busybox/">CVS tree</a>,  
+	<a href="http://busybox.net/cgi-bin/cvsweb/busybox/">CVS tree</a>,  
 	anonymous
-	<a href="http://opensource.lineo.com/cvs_anon.html">CVS access</a>, and
+	<a href="http://busybox.net/cvs_anon.html">CVS access</a>, and
 	for those that are actively contributing there is even 
-	<a href="http://opensource.lineo.com/cvs_write.html">CVS write access</a>.
+	<a href="http://busybox.net/cvs_write.html">CVS write access</a>.
 
 </ul>
 
@@ -300,18 +300,18 @@
 <TR><TD BGCOLOR="#eeeee0">
 Current documentation for BusyBox includes: 
 <ul>
-    <li> <a href="ftp://oss.lineo.com/busybox/BusyBox.html">BusyBox.html</a>.
+    <li> <a href="ftp://busybox.net/busybox/BusyBox.html">BusyBox.html</a>.
 		This is a list of the all the available commands in BusyBox with 
 		complete usage information and examples of how to use each app.  I 
 		have spent a <em>lot</em> of time updating these docs and trying to 
 		make them fairly comprehensive.  If you find any errors (factual, 
 		grammatical, whatever) please let me know.
-    <li> <a href="ftp://oss.lineo.com/busybox/README">README</a>.
+    <li> <a href="ftp://busybox.net/busybox/README">README</a>.
 		This is the README file included in the busybox source release.
-    <li> <a href="http://bugs.lineo.com/db/pa/lbusybox.html">BusyBox Bugs</a>.
+    <li> <a href="http://bugs.busybox.net/db/pa/lbusybox.html">BusyBox Bugs</a>.
 		Need to report a bug?  Need to check if a bug has been filed?
     <li> If you need more help, the BusyBox
-    <a href="http://opensource.lineo.com/lists/busybox/">mailing list</a> is
+    <a href="http://busybox.net/lists/busybox/">mailing list</a> is
     a good place to start.
 </ul>
 
@@ -338,7 +338,7 @@
     <li>  <A HREF="http://freshmeat.net/projects/busybox/">
     Freshmeat AppIndex record for BusyBox</A>
     <p>
-    <li><a href="http://tinylogin.lineo.com/">TinyLogin</a>
+    <li><a href="http://tinylogin.busybox.net/">TinyLogin</a>
         is a nice embedded tool for handling authentication, changing passwords,
 	and similar tasks which nicely complements BusyBox.
     <p>
@@ -350,7 +350,7 @@
 	BusyBox to create very small embedded systems.
     <p>
 
-    <li> <a href="http://opensource.lineo.com/software.html">Other cool embedded software</a>.
+    <li> <a href="http://busybox.net/software.html">Other cool embedded software</a>.
     <p>
 
 </ul>
diff --git a/docs/busybox.net/oldnews.html b/docs/busybox.net/oldnews.html
index 08a49ca..ade65c6 100644
--- a/docs/busybox.net/oldnews.html
+++ b/docs/busybox.net/oldnews.html
@@ -38,7 +38,7 @@
 
 <ul>
 
-    <p> <li> <b>Take me back to the <a href="http://busybox.lineo.com/">BusyBox</a> web site.</b>
+    <p> <li> <b>Take me back to the <a href="http://busybox.net/">BusyBox</a> web site.</b>
     <hr>
 
     <li> <b>10 April 2001 -- BusyBox 0.51 released</b>
@@ -65,21 +65,21 @@
 	     for letting me use their system!).
 	     <p>
 	     You can read the 
-	     <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a> for
+	     <a href="ftp://busybox.net/busybox/Changelog">changelog</a> for
 	     complete details.  BusyBox 0.51 can be downloaded from 
-	     <a href="ftp://oss.lineo.com/busybox">ftp://oss.lineo.com/busybox</a>.
+	     <a href="ftp://busybox.net/busybox">ftp://busybox.net/busybox</a>.
 	     <p>Have Fun!
 	     <p>
 
     <li> <b>Busybox Boot-Floppy Image</b>
 
     <p>Because you asked for it, we have made available a <a href=
-    "ftp://oss.lineo.com/busybox/busybox.floppy.img"> Busybox boot floppy
+    "ftp://busybox.net/busybox/busybox.floppy.img"> Busybox boot floppy
     image</a>. Here's how you use it:
 
     <ol>
 
-	    <li> <a href= "ftp://oss.lineo.com/busybox/busybox.floppy.img">
+	    <li> <a href= "ftp://busybox.net/busybox/busybox.floppy.img">
 	    Download the image</a>
 
 	    <li> dd it onto a floppy like so: <tt> dd if=busybox.floppy.img
@@ -108,7 +108,7 @@
 	     shell is now working very well, and the shell's environment variable
 	     expansion was fixed.   Tons of other things were fixed or made
 	     smaller.  For a fairly complete overview, see the 
-	     <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a>.
+	     <a href="ftp://busybox.net/busybox/Changelog">changelog</a>.
 	     <p>
 	     lash (the busybox shell) is still with us, fixed up a bit so it
 	     now behaves itself quite nicely.  It really is quite usable as
@@ -129,7 +129,7 @@
 	     Several new applets, lots of bug fixes, cleanups, and many smaller 
 	     things made nicer.  Several cleanups and improvements to the shell.
 	     For a list of the most interesting changes 
-	     you might want to look at the <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a>. 
+	     you might want to look at the <a href="ftp://busybox.net/busybox/Changelog">changelog</a>. 
 	     <p>
 	     Special thanks go out to Matt Kraai and Larry Doolittle for all their
 	     work on this release, and for keeping on top of things while I've been 
@@ -161,7 +161,7 @@
 	     woody) a .udeb can now be generated.  
 	     <p>
 	     The curious can get a list of some of the more interesting changes by reading 
-	     the <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a>. 
+	     the <a href="ftp://busybox.net/busybox/Changelog">changelog</a>. 
 	     <p>
 	     Many thanks go out to the many many people that have contributed to 
 	     this release, especially Matt Kraai, Larry Doolittle, and Kent Robotti.
@@ -175,7 +175,7 @@
 	     renice, xargs, and expr.  syslogd now supports network logging.
 	     There are the usual tar updates.  Most apps now use getopt for
 	     more correct option parsing.
-	     See the <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a> 
+	     See the <a href="ftp://busybox.net/busybox/Changelog">changelog</a> 
 	     for complete details.
 
 
@@ -187,7 +187,7 @@
 	     people to dump a binary keymaps for use with 'loadkmap', and a
 	     completely reworked 'grep' and 'sed' which should behave better.
 	     BusyBox shell can now also be used as a login shell.
-	     See the <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a> 
+	     See the <a href="ftp://busybox.net/busybox/Changelog">changelog</a> 
 	     for complete details.
 
 
@@ -199,17 +199,17 @@
 	     release provides the following new apps: cut, tr, insmod, ar,
 	     mktemp, setkeycodes, md5sum, uuencode, uudecode, which, and
 	     telnet.  There are bug fixes for just about every app as well (see
-	     the <a href="ftp://oss.lineo.com/busybox/Changelog">changelog</a> for
+	     the <a href="ftp://busybox.net/busybox/Changelog">changelog</a> for
 	     details).
 	     <p>
 	     Also, some exciting infrastructure news!  Busybox now has its own 
-	     <a href="http://oss.lineo.com/lists/busybox/">mailing list</a>, 
+	     <a href="http://busybox.net/lists/busybox/">mailing list</a>, 
 	     publically browsable
-	     <a href="http://oss.lineo.com/cgi-bin/cvsweb/busybox/">CVS tree</a>,  
+	     <a href="http://busybox.net/cgi-bin/cvsweb/busybox/">CVS tree</a>,  
 	     anonymous
-	     <a href="http://oss.lineo.com/cvs_anon.html">CVS access</a>, and
+	     <a href="http://busybox.net/cvs_anon.html">CVS access</a>, and
 	     for those that are actively contributing there is even 
-	     <a href="http://oss.lineo.com/cvs_write.html">CVS write access</a>.
+	     <a href="http://busybox.net/cvs_write.html">CVS write access</a>.
 	     I think this will be a huge help to the ongoing development of BusyBox.
 	     <p>
 	     Also, for the curious, there is no 0.44 release.  Somehow 0.44 got announced
@@ -250,7 +250,7 @@
 	while say ppp has the syslog open, init would block (which is bad, bad, bad).
 	<p>
 	Karl M. Hegbloom has created a 
-	<a href="ftp://ftp.lineo.com/pub/busybox/busybox-0.43-syslog_patch">fix for the problem</a>.
+	<a href="ftp://busybox.net/pub/busybox/busybox-0.43-syslog_patch">fix for the problem</a>.
 	Thanks Karl!
 
 
@@ -263,7 +263,7 @@
 	freeramdisk, tr, echo, test, and usleep.  Tar has been completely
 	rewritten from scratch.  Bss size has also been greatly reduced.
 	More details are available in the 
-	<a href="ftp://ftp.lineo.com/pub/busybox/Changelog">changelog</a>.
+	<a href="ftp://busybox.net/pub/busybox/Changelog">changelog</a>.
 	Oh, and as a special bonus, I wrote some fairly comprehensive
 	<em>documentation</em>, complete with examples and full usage information.
 
@@ -275,7 +275,7 @@
 	There were others so if I somehow forgot to mention you, I'm very sorry.
 	<p>
 
-	You can grab BusyBox 0.43 tarballs <a href="ftp://ftp.lineo.com/pub/busybox/">here</a>.
+	You can grab BusyBox 0.43 tarballs <a href="ftp://busybox.net/pub/busybox/">here</a>.
 
     <p> <li> <b>9 April 2000 -- BusyBox 0.43 pre release</b>
     <br>
@@ -290,7 +290,7 @@
         enough for production use -- it just isn't a release since I have some structural
         changes I still want to make.
         <p>
-	The pre-release can be found <a href="ftp://ftp.lineo.com/pub/busybox/">here</a>.
+	The pre-release can be found <a href="ftp://busybox.net/pub/busybox/">here</a>.
 	Please let me know ASAP if you find <em>any</em> bugs.
     
     <p> <li> <b>28 March 2000 -- Andersen Baby Boy release</b>
@@ -323,7 +323,7 @@
 
 	     This is the most solid BusyBox release so far.  Many, many
 		bugs have been fixed.   See the 
-<a href="ftp://ftp.lineo.com/pub/busybox/Changelog">changelog</a> for details.
+		<a href="ftp://busybox.net/pub/busybox/Changelog">changelog</a> for details.
 
 		Of particular interest, init will now cleanly unmount 
 		filesystems on reboot, cp and mv have been rewritten and 
@@ -340,7 +340,7 @@
 		mkdir, syslogd, and init.  New apps include wc, hostid, 
 		logname, tty, whoami, and yes.  New features include loop device
 		support in mount and umount, and better TERM handling by init.
-		The changelog can be found <a href="ftp://ftp.lineo.com/pub/busybox/Changelog">here</a>.
+		The changelog can be found <a href="ftp://busybox.net/pub/busybox/Changelog">here</a>.
 
     <p> <li> <b>7 January 2000 -- BusyBox 0.40 released</b>
     <br>
@@ -350,7 +350,7 @@
 	     New apps include sort, uniq, lsmod, rmmod, fbset, and loadacm.
 	     In particular, this release fixes an important bug in tar which 
 	     in some cases produced serious security problems.
-	     As always, the changelog can be found <a href="ftp://ftp.lineo.com/pub/busybox/Changelog">here</a>.
+	     As always, the changelog can be found <a href="ftp://busybox.net/pub/busybox/Changelog">here</a>.
 
     <p> <li> <b>11 December 1999 -- BusyBox Website</b>
     <br>
@@ -364,7 +364,7 @@
     <br>
 	     This release includes fixes to init, reboot, halt, kill, and ls, and contains 
 	     the new apps ping, hostname, mkfifo, free, tail, du, tee, and head.  A full
-	     changelog can be found <a href="ftp://ftp.lineo.com/pub/busybox/Changelog">here</a>.
+	     changelog can be found <a href="ftp://busybox.net/pub/busybox/Changelog">here</a>.
     <p> <li> <b>5 December 1999 -- BusyBox 0.38 released</b>
     <br>
 	     This release includes fixes to tar, cat, ls, dd, rm, umount, find, df, 
@@ -385,7 +385,7 @@
 
 <ul> 
 
-    <li> <a href="http://busybox.lineo.com/">Take me back to http://busybox.lineo.com/</a>.
+    <li> <a href="http://busybox.net/">Take me back to http://busybox.net/</a>.
     <p>
 
     <li>  <A HREF="http://perens.com/FreeSoftware/">
@@ -398,10 +398,7 @@
     Freshmeat AppIndex record for BusyBox</A>
     <p>
 
-    <li> <a href="http://oss.lineo.com/software.html">Cool embedded software</a>.
-    <p>
-
-    <li> <a href="http://oss.lineo.com/">oss.lineo.com</a>.
+    <li> <a href="http://busybox.net/software.html">Cool embedded software</a>.
     <p>
 
 </ul>
diff --git a/docs/contributing.txt b/docs/contributing.txt
index 2e00492..c1e3f38 100644
--- a/docs/contributing.txt
+++ b/docs/contributing.txt
@@ -5,7 +5,7 @@
 you can help, guidelines on testing, and how to submit a well-formed patch
 that is more likely to be accepted.
 
-The Busybox home page is at: http://busybox.lineo.com
+The Busybox home page is at: http://busybox.net/
 
 
 
@@ -28,8 +28,8 @@
 For information on how to check out Busybox from CVS, please look at the
 following links:
 
-	http://oss.lineo.com/cvs_anon.html
-	http://oss.lineo.com/cvs_howto.html
+	http://busybox.net/cvs_anon.html
+	http://busybox.net/cvs_howto.html
 
 
 Read the Mailing List
@@ -43,7 +43,7 @@
 
 Archives can be found here:
 
-	http://opensource.lineo.com/lists/busybox/
+	http://busybox.net/lists/busybox/
 
 If you have a serious interest in Busybox, i.e., you are using it day-to-day or
 as part of an embedded project, it would be a good idea to join the mailing
@@ -51,7 +51,7 @@
 
 A web-based sign-up form can be found here:
 
-	http://opensource.lineo.com/mailman/listinfo/busybox
+	http://busybox.net/mailman/listinfo/busybox
 
 
 Coordinate with the Applet Maintainer
diff --git a/docs/new-applet-HOWTO.txt b/docs/new-applet-HOWTO.txt
index a00dfcc..edf7eee 100644
--- a/docs/new-applet-HOWTO.txt
+++ b/docs/new-applet-HOWTO.txt
@@ -132,7 +132,7 @@
 
 Then create a diff -urN of the files you added (<applet>.c, usage.c,
 applets.h, Config.h) and send it to the mailing list:
-busybox@opensource.lineo.com. Sending patches as attachments is preferred, but
+busybox@busybox.net. Sending patches as attachments is preferred, but
 not required.
 
 
diff --git a/examples/bootfloppy/bootfloppy.txt b/examples/bootfloppy/bootfloppy.txt
index 575c93f..36d6280 100644
--- a/examples/bootfloppy/bootfloppy.txt
+++ b/examples/bootfloppy/bootfloppy.txt
@@ -6,7 +6,7 @@
 
  - Linux Kernel (http://www.kernel.org)
  - uClibc: C library (http://cvs.uclinux.org/uClibc.html)
- - Busybox: Unix utilities (http://busybox.lineo.com)
+ - Busybox: Unix utilities (http://busybox.net/)
  - Syslinux: bootloader (http://syslinux.zytor.com)
 
 It is based heavily on a paper presented by Erik Andersen at the 2001 Embedded
diff --git a/examples/busybox.spec b/examples/busybox.spec
index 6ac26d5..188b09b 100644
--- a/examples/busybox.spec
+++ b/examples/busybox.spec
@@ -12,8 +12,8 @@
 Copyright: GPL
 Group: System/Utilities
 Summary: BusyBox is a tiny suite of Unix utilities in a multi-call binary.
-URL:	 http://busybox.lineo.com/
-Source:	 ftp://oss.lineo.com/busybox/%{name}-%{version}.tar.gz
+URL:	 http://busybox.net/
+Source:	 ftp://busybox.net/busybox/%{name}-%{version}.tar.gz
 Buildroot: /var/tmp/%{name}-%{version}
 Packager : Erik Andersen <andersen@codepoet.org>
 
diff --git a/scripts/Menuconfig b/scripts/Menuconfig
index 8f51169..30d06ee 100644
--- a/scripts/Menuconfig
+++ b/scripts/Menuconfig
@@ -704,7 +704,7 @@
 			cat <<EOM
 
 Please report this to the maintainer <mec@shout.net>.  You may also
-send a problem report to <busybox@oss.lineo.com>.
+send a problem report to <busybox@busybox.net>.
 
 Please indicate the BusyBox version you are trying to configure and
 which menu you were trying to enter when this error occurred.
@@ -767,7 +767,7 @@
 
 If you have verified that your ncurses install is correct, you may email
 the maintainer <andersen@codepoet.org> or post a message to
-<busybox@oss.lineo.com> for additional assistance. 
+<busybox@busybox.net> for additional assistance. 
 
 EOM
 			cleanup
diff --git a/shell/lash.c b/shell/lash.c
index 79fd433..4155f8d 100644
--- a/shell/lash.c
+++ b/shell/lash.c
@@ -1228,7 +1228,7 @@
 #ifdef CONFIG_FEATURE_SH_STANDALONE_SHELL
 	/* Check if the command matches any busybox internal
 	 * commands ("applets") here.  Following discussions from
-	 * November 2000 on busybox@opensource.lineo.com, don't use
+	 * November 2000 on busybox@busybox.net, don't use
 	 * get_last_path_component().  This way explicit (with
 	 * slashes) filenames will never be interpreted as an
 	 * applet, just like with builtins.  This way the user can