diff --git a/.gitignore b/.gitignore
index f0fa3d3..9a983bf 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,4 +7,9 @@ config.status
 configure
 install-sh
 missing
+xf86vidmodeproto.pc
+*~
 xf86vidmodeproto.pc*~
+xf86vidmodeproto-*.tar.*
+ChangeLog
+tags
diff --git a/Makefile.am b/Makefile.am
index 4265ed2..2211100 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ xf86vidmode_HEADERS = \
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = xf86vidmodeproto.pc
 
-EXTRA_DIST = autogen.sh xf86vidmodeproto.pc.in
+EXTRA_DIST = xf86vidmodeproto.pc.in
 
 EXTRA_DIST += ChangeLog
 MAINTAINERCLEANFILES = ChangeLog
@@ -14,6 +14,6 @@ MAINTAINERCLEANFILES = ChangeLog
 .PHONY: ChangeLog
 
 ChangeLog:
-	(GIT_DIR=$(top_srcdir)/.git git-log > .changelog.tmp && mv .changelog.tmp ChangeLog; rm -f .changelog.tmp) || (touch ChangeLog; echo 'git directory not found: installing possibly empty changelog.' >&2)
+	$(CHANGELOG_CMD)
 
 dist-hook: ChangeLog
diff --git a/configure.ac b/configure.ac
index 945dcc4..d5dab6c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,11 @@ AC_PREREQ([2.57])
 AC_INIT([XF86VidModeProto], [2.2.2], [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
+# Require xorg-macros: XORG_CHANGELOG
+m4_ifndef([XORG_MACROS_VERSION], [AC_FATAL([must install xorg-macros 1.2 or later before running autoconf/autogen])])
+XORG_MACROS_VERSION(1.2)
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile
            xf86vidmodeproto.pc])