diff --git a/build.py b/build.py
index 7f7fd80d..dd0fcdf0 100755
--- a/build.py
+++ b/build.py
@@ -366,7 +366,7 @@ class pushDir(object):
 
         
 def getBuildDir(options):
-    BUILD_DIR = opj(phoenixDir(), 'bld')
+    BUILD_DIR = opj(phoenixDir(), 'build', 'wxbld')
     if options.build_dir:
         BUILD_DIR = os.path.abspath(options.build_dir)        
     if isDarwin:
@@ -1113,7 +1113,7 @@ def waf_py(options, args):
     DESTDIR = options.installdir
     PREFIX = options.prefix
 
-    wafBuildBase = posixjoin('build_waf', PYVER)
+    wafBuildBase = posixjoin('build', 'waf', PYVER)
     if isWindows:
         if PYTHON_ARCH == '64bit':
             wafBuildBase = posixjoin(wafBuildBase, 'x64')
@@ -1216,7 +1216,7 @@ def clean_py(options, args):
         else:
             build_base += '/carbon'
     deleteIfExists(build_base)
-    deleteIfExists('build_waf')  # make this smarter later, or just use 'build' for waf too
+    deleteIfExists('build/waf')
     files = list()
     for wc in ['*.py', '*.pyc', '*.so', '*.dylib', '*.pyd', '*.pdb', '*.pi']:
         files += glob.glob(opj(cfg.PKGDIR, wc))
diff --git a/wscript b/wscript
index f4c33e31..682374a4 100644
--- a/wscript
+++ b/wscript
@@ -23,7 +23,7 @@ isWindows = sys.platform.startswith('win')
 isDarwin = sys.platform == "darwin"
 
 top = '.'
-out = 'build_waf'
+out = 'build/waf'
 
 
 def options(opt):