diff --git a/Makefile.am b/Makefile.am
index 45a02603..603c0327 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -30,7 +30,7 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
-SUBDIRS = doc include m4 man src examples test build obj
+SUBDIRS = doc include m4 man src examples test build objs
 
 DISTCLEANFILES = libtool-disable-static
 
diff --git a/configure.ac b/configure.ac
index 89256407..75561cda 100644
--- a/configure.ac
+++ b/configure.ac
@@ -444,13 +444,13 @@ AC_CONFIG_FILES([ \
 	test/metaflac-test-files/Makefile \
 	test/pictures/Makefile \
 	build/Makefile \
-	obj/Makefile \
-	obj/debug/Makefile \
-	obj/debug/bin/Makefile \
-	obj/debug/lib/Makefile \
-	obj/release/Makefile \
-	obj/release/bin/Makefile \
-	obj/release/lib/Makefile \
+	objs/Makefile \
+	objs/debug/Makefile \
+	objs/debug/bin/Makefile \
+	objs/debug/lib/Makefile \
+	objs/release/Makefile \
+	objs/release/bin/Makefile \
+	objs/release/lib/Makefile \
 ])
 AC_OUTPUT
 
diff --git a/obj/Makefile.am b/objs/Makefile.am
similarity index 100%
rename from obj/Makefile.am
rename to objs/Makefile.am
diff --git a/obj/debug/Makefile.am b/objs/debug/Makefile.am
similarity index 100%
rename from obj/debug/Makefile.am
rename to objs/debug/Makefile.am
diff --git a/obj/debug/bin/Makefile.am b/objs/debug/bin/Makefile.am
similarity index 100%
rename from obj/debug/bin/Makefile.am
rename to objs/debug/bin/Makefile.am
diff --git a/obj/debug/lib/Makefile.am b/objs/debug/lib/Makefile.am
similarity index 100%
rename from obj/debug/lib/Makefile.am
rename to objs/debug/lib/Makefile.am
diff --git a/obj/release/Makefile.am b/objs/release/Makefile.am
similarity index 100%
rename from obj/release/Makefile.am
rename to objs/release/Makefile.am
diff --git a/obj/release/bin/Makefile.am b/objs/release/bin/Makefile.am
similarity index 100%
rename from obj/release/bin/Makefile.am
rename to objs/release/bin/Makefile.am
diff --git a/obj/release/lib/Makefile.am b/objs/release/lib/Makefile.am
similarity index 100%
rename from obj/release/lib/Makefile.am
rename to objs/release/lib/Makefile.am