diff --git a/src/etc/gen-astencode b/src/etc/gen-astencode
index 79316c23dca8..d490c1c12193 100755
--- a/src/etc/gen-astencode
+++ b/src/etc/gen-astencode
@@ -14,15 +14,15 @@ function msg {
         echo "****************************************"
 }
 
-M=src/comp/metadata
+M=src/rustc/metadata
 GEN_TYPES="syntax::ast::item syntax::ast::def middle::typeck::method_origin \
            middle::freevars::freevar_entry syntax::ast::def_id
            syntax::ast::inlined_item"
 
 # Find serializer tool:
-for S in build/*/stage1/bin/serializer; do
+for S in */stage1/bin/serializer; do
 
-    echo "Generating src/comp/metadata/astencode_gen.rs"
+    echo "Generating src/rustc/metadata/astencode_gen.rs"
 
     # First, generate dummy fns so that the compiler can type
     # everything.
@@ -51,7 +51,7 @@ for S in build/*/stage1/bin/serializer; do
     fi
 
     # Generate the real code into a temporary file.
-    if ! "$S" src/comp/rustc.rc $GEN_TYPES > tmp.$$.rs
+    if ! "$S" src/rustc/rustc.rc $GEN_TYPES > tmp.$$.rs
     then
         msg
         rm tmp.$$.rs