diff --git a/core/ac/Makefile.am b/ac/Makefile.am
similarity index 100%
rename from core/ac/Makefile.am
rename to ac/Makefile.am
diff --git a/core/autogen.sh b/autogen.sh
similarity index 100%
rename from core/autogen.sh
rename to autogen.sh
diff --git a/core/configure.ac b/configure.ac
similarity index 97%
rename from core/configure.ac
rename to configure.ac
index 9fc9894d2..c2102c153 100644
--- a/core/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.57)
 AC_INIT(aegisub, 1.10)
 AC_CONFIG_AUX_DIR(ac)
 AM_INIT_AUTOMAKE
-AC_CONFIG_HEADER([posix/acconf.h])
+AC_CONFIG_HEADER([core/posix/acconf.h])
 
 AC_CANONICAL_HOST
 
@@ -134,7 +134,8 @@ AC_HEADER_STDBOOL
 AC_OUTPUT([
 	Makefile
 	ac/Makefile
-	posix/Makefile
-	bitmaps/Makefile
+	core/Makefile
+	core/posix/Makefile
+	core/bitmaps/Makefile
 ])
 
diff --git a/core/Makefile.am b/core/Makefile.am
index a5d6db5ce..d285c7463 100644
--- a/core/Makefile.am
+++ b/core/Makefile.am
@@ -1,8 +1,7 @@
-AUTOMAKE_OPTIONS = foreign
 EXTRA_DIST = res.rc $(srcdir)/*.h
 SUFFIXES = .c .cpp .rc
 
-SUBDIRS = ac bitmaps posix
+SUBDIRS = bitmaps posix
 
 bin_PROGRAMS = aegisub
 
diff --git a/core/bitmaps/Makefile.am b/core/bitmaps/Makefile.am
index 12184412b..89b33d94d 100644
--- a/core/bitmaps/Makefile.am
+++ b/core/bitmaps/Makefile.am
@@ -3,7 +3,7 @@ CLEANFILES = Makefile.bitmaps *.xpm
 
 .PHONY: all-bitmaps
 
-Makefile.bitmaps: $(srcdir)/genxpm.sh $(top_srcdir)/res.rc
+Makefile.bitmaps: $(srcdir)/genxpm.sh $(srcdir)/../res.rc
 	/bin/sh $^ $(srcdir) >$@
 
 all: all-bitmaps
diff --git a/core/posix/Makefile.am b/core/posix/Makefile.am
index 31986501b..609fa521d 100644
--- a/core/posix/Makefile.am
+++ b/core/posix/Makefile.am
@@ -3,7 +3,7 @@ nodist_libposix_a_SOURCES = res.cpp
 CLEANFILES = res.cpp res.h
 EXTRA_DIST = genres.sh defines.h
 
-res.h: $(srcdir)/genres.sh $(top_srcdir)/res.rc 
+res.h: $(srcdir)/genres.sh $(srcdir)/../res.rc 
 	/bin/sh $^
 res.cpp: res.h