diff --git a/README.TXT b/README.TXT
index 882f9c3..9b3d1c4 100644
--- a/README.TXT
+++ b/README.TXT
@@ -32,9 +32,9 @@ Downloading the source packages
 When you run the build script it will ask you to choose from one of two options, one for if you have already downloaded the source packages and another for if you want it to download them for you (using wget).  If you choose option one and want to get the source packages for yourself then you can find them at the urls listed below;
 
 binutils 2.16.1  - http://ftp.gnu.org/gnu/binutils/binutils-2.16.1.tar.bz2
-gcc-core 4.0.1 - http://ftp.gnu.org/gnu/gcc/gcc-4.0.1/gcc-core-3.4.4.tar.bz2
-gcc-g++ 4.0.1 - http://ftp.gnu.org/gnu/gcc/gcc-4.0.1/gcc-g++-3.4.4.tar.bz2
-newlib 1.13.0  - ftp://sources.redhat.com/pub/newlib/newlib-1.13.0.tar.gz
+gcc-core 4.1.0 - http://ftp.gnu.org/gnu/gcc/gcc-4.0.1/gcc-core-4.1.0.tar.bz2
+gcc-g++ 4.1.0 - http://ftp.gnu.org/gnu/gcc/gcc-4.0.1/gcc-g++-4.1.0.tar.bz2
+newlib 1.14.0  - ftp://sources.redhat.com/pub/newlib/newlib-1.14.0.tar.gz
 
 libogc, libgba and libnds can be found in the sourceforge project.
 
@@ -98,15 +98,15 @@ to use the built in crt0 and linkscript use powerpc-elf-gcc to link your project
 Credits
 -------
 
-* Thanks to WinterMute for bringing us devkitARM, the website is http://www.devkit.tk
+* Thanks to WinterMute for bringing us devkitARM, the website is http://www.devkitpro.org
 * Build scripts written by WinterMute and tied together by GreenGianT
-* Thanks to Mr Spiv, Honkey Kong and JoostP for OS X testing
+* Thanks to Mr Spiv, Honkey Kong, Raleigh and JoostP for OS X testing
 * libogc written and supplied by Shagkur. Additional code by WinterMute
 * libgba by WinterMute
+* libnds by Joat, Dovoto and WinterMute with contributions from many others.
 * libmirko by Mr Mirko
 * b2fxec by Mr Spiv
 * scripts made BSD compatible by o2addict
-* Dovoto and Joat for DS libraries
 
   - efnet #gbadev forever!
 
diff --git a/dkarm/crtls/ds_arm7.ld b/dkarm/crtls/ds_arm7.ld
index 3935476..8c493df 100644
--- a/dkarm/crtls/ds_arm7.ld
+++ b/dkarm/crtls/ds_arm7.ld
@@ -8,14 +8,17 @@ MEMORY {
 	iwram	: ORIGIN = 0x03800000, LENGTH = 64K	
 	ewram	: ORIGIN = 0x02040000, LENGTH = 4M
 }
-__iwram_start	= 0x03800000;
-__iwram_end		= 0x03810000;
 
-__sp_irq			=	__iwram_end - 0x60;
-__sp_svc			=	__sp_irq - 0x100;
-__sp_usr			=	__sp_svc - 0x100;
+__ewram_start	=	ORIGIN(ewram);
+__eheap_end		=	ORIGIN(ewram)+ LENGTH(ewram);
+__iwram_start = ORIGIN(iwram);
+__iwram_top		=	ORIGIN(iwram)+ LENGTH(iwram);
+__sp_irq		=	__iwram_top - 0x60;
+__sp_svc		=	__sp_irq - 0x100;
+__sp_usr		=	__sp_svc - 0x100;
 
-__irq_flags		=	0x0380fff8;
+__irq_flags		=	__iwram_top - 8;
+__irq_vector	=	__iwram_top - 4;
 
 SECTIONS
 {
diff --git a/dkarm/crtls/ds_cart.ld b/dkarm/crtls/ds_cart.ld
index 9d4f586..c0fa3e0 100644
--- a/dkarm/crtls/ds_cart.ld
+++ b/dkarm/crtls/ds_cart.ld
@@ -8,15 +8,17 @@ MEMORY {
 	iwram	: ORIGIN = 0x03800000, LENGTH = 64K	
 	ewram	: ORIGIN = 0x02000000, LENGTH = 4M
 }
-__iwram_start = 0x03800000;
 
-__ewram_start	=	0x02000000;
-__eheap_end		=	0x02040000;
-__sp_irq		=	0x03810000 - 0x60;
+__ewram_start	=	ORIGIN(ewram);
+__eheap_end		=	ORIGIN(ewram)+ LENGTH(ewram);
+__iwram_start = ORIGIN(iwram);
+__iwram_top		=	ORIGIN(iwram)+ LENGTH(iwram);
+__sp_irq		=	__iwram_top - 0x60;
 __sp_svc		=	__sp_irq - 0x100;
 __sp_usr		=	__sp_svc - 0x100;
 
-__irq_flags		=	0x0380fff8;
+__irq_flags		=	__iwram_top - 8;
+__irq_vector	=	__iwram_top - 4;
 
 SECTIONS
 {