diff --git a/build-devkit.sh b/build-devkit.sh
index 2a03b48..ffe92c6 100644
--- a/build-devkit.sh
+++ b/build-devkit.sh
@@ -2,7 +2,7 @@
 #---------------------------------------------------------------------------------
 # Build scripts for
 #	devkitARM release 26
-#	devkitPPC release 17
+#	devkitPPC release 18
 #	devkitPSP release 13
 #---------------------------------------------------------------------------------
 
@@ -15,13 +15,13 @@ fi
 #---------------------------------------------------------------------------------
 # specify some urls to download the source packages from
 #---------------------------------------------------------------------------------
-LIBOGC_VER=1.7.2
+LIBOGC_VER=1.8.0
 LIBGBA_VER=20081210
-LIBNDS_VER=1.3.3
+LIBNDS_VER=1.3.8
 DEFAULT_ARM7_VER=0.5.2
-DSWIFI_VER=0.3.7
+DSWIFI_VER=0.3.10
 LIBMIRKO_VER=0.9.7
-MAXMOD_VER=1.0.4
+MAXMOD_VER=1.0.6
 FILESYSTEM_VER=0.9.2
 LIBFAT_VER=1.0.5
 
diff --git a/dkppc/scripts/build-gcc.sh b/dkppc/scripts/build-gcc.sh
index 0ec877f..d3d2f4b 100644
--- a/dkppc/scripts/build-gcc.sh
+++ b/dkppc/scripts/build-gcc.sh
@@ -99,9 +99,10 @@ then
   --disable-libstdcxx-pch \
   --target=$target \
   --with-newlib \
+  --with-headers \
   --prefix=$prefix\
   --disable-dependency-tracking \
-  --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPPC release 18 alpha5" \
+  --with-bugurl="http://wiki.devkitpro.org/index.php/Bug_Reports" --with-pkgversion="devkitPPC release 18" \
   2>&1 | tee gcc_configure.log
   touch configured-gcc
 fi