diff --git a/.gitmodules b/.gitmodules
index 5d4af89..58e003b 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@
 [submodule "binutils"]
 	path = binutils
 	url = git://git.xcsoar.org/xcsoar/max/cegcc-binutils.git
-[submodule "gcc-4.4.0"]
-	path = gcc-4.4.0
+[submodule "gcc"]
+	path = gcc
 	url = git://git.xcsoar.org/xcsoar/max/cegcc-gcc.git
 [submodule "mingw"]
 	path = mingw
diff --git a/build-arm-mingw32ce/build-mingw32ce.sh b/build-arm-mingw32ce/build-mingw32ce.sh
index 689d8e2..c683cef 100755
--- a/build-arm-mingw32ce/build-mingw32ce.sh
+++ b/build-arm-mingw32ce/build-mingw32ce.sh
@@ -16,10 +16,6 @@ export BUILD_DIR=`pwd`
 
 ac_default_prefix="$BUILD_DIR/../bindist-arm-mingw32ce"
 
-if test -z "${gcc_src}"; then
-    export gcc_src=gcc-4.4.0
-fi
-
 # The list of components, in build order.  There's a build_FOO
 # function for each of these components
 COMPONENTS=( binutils bootstrap_gcc mingw w32api gcc dlls )
@@ -243,7 +239,7 @@ build_binutils()
 
 build_bootstrap_gcc()
 {
-    configure_host_module $gcc_src gcc-bootstrap \
+    configure_host_module gcc gcc-bootstrap \
 	--with-gcc                     \
 	--with-gnu-ld                  \
 	--with-gnu-as                  \
@@ -319,7 +315,7 @@ build_mingw()
 
 build_gcc()
 {
-    configure_host_module ${gcc_src} gcc \
+    configure_host_module gcc gcc \
         --with-gcc                     \
         --with-gnu-ld                  \
         --with-gnu-as                  \
@@ -495,7 +491,7 @@ done
 
 export TARGET="arm-mingw32ce"
 #export TARGET="arm-wince-mingw32ce"
-export BUILD=`sh ${BASE_DIRECTORY}/${gcc_src}/config.guess`
+export BUILD=`sh ${BASE_DIRECTORY}/gcc/config.guess`
 if [ "x${host}" != "x" ]; then
     export HOST="${host}"
 else
diff --git a/gcc-4.4.0 b/gcc
similarity index 100%
rename from gcc-4.4.0
rename to gcc
diff --git a/mingwdll b/mingwdll
index f86a66c..c1c666f 160000
--- a/mingwdll
+++ b/mingwdll
@@ -1 +1 @@
-Subproject commit f86a66cb3042a96bb6bad600f71df4d2c90036a4
+Subproject commit c1c666f793d135a4c834c94a9f1237cce4185c45