diff --git a/.gitignore b/.gitignore
index 0f8ca90..c569484 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,5 +15,6 @@ install-sh
 libtool
 ltmain.sh
 missing
+stamp-h1
 .deps/
 .libs/
diff --git a/configure.ac b/configure.ac
index 6d73189..e401999 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ AC_INIT([libxkbcommon], [0.1.0],
     [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([dist-bzip2 foreign])
 AM_MAINTAINER_MODE
+AC_CONFIG_HEADERS([src/config.h])
 
 AC_PROG_LIBTOOL
 AC_PROG_CC
diff --git a/src/.gitignore b/src/.gitignore
index 1fd57cf..3d9455b 100644
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,2 +1,3 @@
+config.h*
 ks_tables.h
 libxkbcommon.la