diff --git a/.gitignore b/.gitignore
index 35d9813c..0ab1090f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,6 +21,7 @@
 
 # automake/autoconf
 .deps/
+.dirstamp
 .libs/
 Makefile
 Makefile.in
diff --git a/configure.ac b/configure.ac
index ac3954f0..632853e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -37,7 +37,7 @@
 
 AC_PREREQ([2.61])
 AC_INIT([guacamole-server], [0.8.3])
-AM_INIT_AUTOMAKE([-Wall -Werror foreign])
+AM_INIT_AUTOMAKE([-Wall -Werror foreign subdir-objects])
 
 LT_PREREQ([2.2])
 LT_INIT([dlopen])