diff --git a/Makefile.am b/Makefile.am
index 0d6f0fd2..3d0a09fe 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-#AUTOMAKE_OPTIONS = subdir-objects
-
 AM_CPPFLAGS = \
 	-include $(top_builddir)/config.h \
 	-I$(top_srcdir) \
diff --git a/configure.ac b/configure.ac
index 2f804bba..4b647415 100644
--- a/configure.ac
+++ b/configure.ac
@@ -6,7 +6,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_INIT([procps-ng],
 	m4_esyscmd([misc/git-version-gen .tarball-version]),
 	[procps@freelists.org],,[http://gitorious.org/procps])
-AM_INIT_AUTOMAKE([foreign 1.11 -Wall -Wno-portability tar-pax no-dist-gzip dist-xz])
+AM_INIT_AUTOMAKE([foreign 1.11 subdir-objects -Wall -Wno-portability tar-pax no-dist-gzip dist-xz])
 AM_SILENT_RULES([yes])
 AC_CONFIG_SRCDIR([free.c])
 AC_CONFIG_HEADERS([config.h])