diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..7fc003f
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,14 @@
+trapdir = $(includedir)/X11/extensions
+trap_HEADERS = \
+	xtrapbits.h \
+	xtrapddmi.h \
+	xtrapdi.h \
+	xtrapemacros.h \
+	xtraplib.h \
+	xtraplibp.h \
+	xtrapproto.h
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = trapext.pc
+
+EXTRA_DIST = autogen.sh trapext.pc.in
diff --git a/autogen.sh b/autogen.sh
new file mode 100755
index 0000000..904cd67
--- /dev/null
+++ b/autogen.sh
@@ -0,0 +1,12 @@
+#! /bin/sh
+
+srcdir=`dirname $0`
+test -z "$srcdir" && srcdir=.
+
+ORIGDIR=`pwd`
+cd $srcdir
+
+autoreconf -v --install || exit 1
+cd $ORIGDIR || exit $?
+
+$srcdir/configure --enable-maintainer-mode "$@"
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..2bc1541
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,6 @@
+AC_PREREQ([2.57])
+AC_INIT([TrapExt], [7.0], [xorg@lists.freedesktop.org])
+AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+AC_OUTPUT([Makefile
+           trapext.pc])
diff --git a/trapext.pc.in b/trapext.pc.in
new file mode 100644
index 0000000..a77166d
--- /dev/null
+++ b/trapext.pc.in
@@ -0,0 +1,9 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+ 
+Name: TrapExt
+Description: Trap extension headers
+Version: @PACKAGE_VERSION@
+Cflags: -I${includedir}