diff --git a/FILES b/FILES
index 61d9b32..2d71e36 100644
--- a/FILES
+++ b/FILES
@@ -65,19 +65,19 @@ cookie.c
 auto-str=x
 auto-str.c
 conf-bin
-auto_bin.c.do
+make/auto_bin.c.do
 auto_bin.h
 conf-man
 install=x
 install.c
-setup.do
-man.do
-it.do
-targets.do
-default.do
-default.a.do
-default.o.do
-default.0.do
+make/setup.do
+make/man.do
+make/it.do
+make/targets.do
+make/default.do
+make/default.a.do
+make/default.o.do
+make/default.0.do
 conf-cc
 conf-ld
 find-systype.sh
@@ -181,7 +181,7 @@ open.h
 open_append.c
 open_read.c
 open_trunc.c
-uint32.h.do
+make/uint32.h.do
 uint32.h1
 uint32.h2
 tryulong32.c
@@ -202,7 +202,7 @@ scan.h
 scan_ulong.c
 scan_8long.c
 lock=l
-hasflock.h.do
+make/hasflock.h.do
 lock.h
 lock_ex.c
 tryflock.c
@@ -217,7 +217,7 @@ sig=l
 sig.h
 sig_catch.c
 sig_pipe.c
-hassgact.h.do
+make/hassgact.h.do
 trysgact.c
 datetime.3
 datetime=0
@@ -235,13 +235,13 @@ seek=l
 seek.h
 seek_set.c
 conf-qmail
-auto_qmail.c.do
+make/auto_qmail.c.do
 auto_qmail.h
 qmail.h
 qmail.c
 direntry.3
 direntry=0
-direntry.h.do
+make/direntry.h.do
 direntry.h1
 direntry.h2
 trydrent.c
diff --git a/all.do b/build/all.do
similarity index 100%
rename from all.do
rename to build/all.do
diff --git a/clean.do b/build/clean.do
similarity index 100%
rename from clean.do
rename to build/clean.do
diff --git a/default.0.do b/build/default.0.do
similarity index 100%
rename from default.0.do
rename to build/default.0.do
diff --git a/default.a.do b/build/default.a.do
similarity index 100%
rename from default.a.do
rename to build/default.a.do
diff --git a/default.do b/build/default.do
similarity index 100%
rename from default.do
rename to build/default.do
diff --git a/default.lib.do b/build/default.lib.do
similarity index 100%
rename from default.lib.do
rename to build/default.lib.do
diff --git a/default.lo.do b/build/default.lo.do
similarity index 100%
rename from default.lo.do
rename to build/default.lo.do
diff --git a/default.o.do b/build/default.o.do
similarity index 100%
rename from default.o.do
rename to build/default.o.do
diff --git a/default.so.do b/build/default.so.do
similarity index 100%
rename from default.so.do
rename to build/default.so.do
diff --git a/ezmlmrc.all.do b/build/ezmlmrc.all.do
similarity index 100%
rename from ezmlmrc.all.do
rename to build/ezmlmrc.all.do
diff --git a/install.do b/build/install.do
similarity index 100%
rename from install.do
rename to build/install.do
diff --git a/it.do b/build/it.do
similarity index 100%
rename from it.do
rename to build/it.do
diff --git a/man.do b/build/man.do
similarity index 100%
rename from man.do
rename to build/man.do
diff --git a/messages-txt.c.do b/build/messages-txt.c.do
similarity index 100%
rename from messages-txt.c.do
rename to build/messages-txt.c.do
diff --git a/messages.all.do b/build/messages.all.do
similarity index 100%
rename from messages.all.do
rename to build/messages.all.do
diff --git a/mysql.do b/build/mysql.do
similarity index 100%
rename from mysql.do
rename to build/mysql.do
diff --git a/pgsql.do b/build/pgsql.do
similarity index 100%
rename from pgsql.do
rename to build/pgsql.do
diff --git a/setup.do b/build/setup.do
similarity index 100%
rename from setup.do
rename to build/setup.do
diff --git a/sqlite3.do b/build/sqlite3.do
similarity index 100%
rename from sqlite3.do
rename to build/sqlite3.do
diff --git a/systype.do b/build/systype.do
similarity index 100%
rename from systype.do
rename to build/systype.do
diff --git a/targets.do b/build/targets.do
similarity index 100%
rename from targets.do
rename to build/targets.do
diff --git a/tools/makemake b/tools/makemake
index 7237d0b..0439cda 100755
--- a/tools/makemake
+++ b/tools/makemake
@@ -125,7 +125,7 @@ def runit(t, filename, **kw):
 
 def target(name, parent=None):
     debug('target(name={!r}, parent={!r})'.format(name, parent and parent.target))
-    if os.path.exists(name) and not os.path.exists(name+'.do'):
+    if os.path.exists(name) and not (os.path.exists('build/{}.do'.format(name)) or os.path.exists('{}.do'.format(name))):
         debug('  SOURCES.add({!r})'.format(name))
         SOURCES.add(name)
     elif name in TARGETS or name in SOURCES or (parent and parent.has_parent(name)):
@@ -134,7 +134,10 @@ def target(name, parent=None):
     else:
         target = Target(name, parent)
         base,ext = split(name)
-        for dofile in [ name+'.do', 'default.{}.do'.format(ext), 'default.do' ]:
+        for dofile in [ '{}.do'.format(name),
+                        'build/{}.do'.format(name),
+                        'build/default.{}.do'.format(ext),
+                        'build/default.do' ]:
             if os.path.exists(dofile):
                 runit(target, dofile, base=base, ext=ext, target=name)
                 break