diff -ruN xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/Makefile.am xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/Makefile.am
--- xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/Makefile.am	2008-03-20 18:58:52.000000000 +0000
+++ xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/Makefile.am	2009-02-02 20:26:25.000000000 +0000
@@ -20,11 +20,12 @@
 
 AUTOMAKE_OPTIONS = foreign
 SUBDIRS = src man
-
-CLEANFILES = ChangeLog
 EXTRA_DIST = ChangeLog
+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 -ruN xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/README xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/README
--- xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/README	1970-01-01 00:00:00.000000000 +0000
+++ xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/README	2009-02-02 20:26:25.000000000 +0000
@@ -0,0 +1,20 @@
+xf86-input-calcomp - Calcomp input driver for the Xorg X server
+
+Please submit bugs & patches to the Xorg bugzilla:
+
+        https://bugs.freedesktop.org/enter_bug.cgi?product=xorg
+
+All questions regarding this software should be directed at the
+Xorg mailing list:
+
+        http://lists.freedesktop.org/mailman/listinfo/xorg
+
+The master development code repository can be found at:
+
+        git://anongit.freedesktop.org/git/xorg/driver/xf86-input-calcomp
+
+        http://cgit.freedesktop.org/xorg/driver/xf86-input-calcomp
+
+For more information on the git code manager, see:
+
+        http://wiki.x.org/wiki/GitPage
diff -ruN xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/configure.ac xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/configure.ac
--- xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/configure.ac	2008-03-20 18:58:52.000000000 +0000
+++ xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/configure.ac	2009-02-02 20:26:25.000000000 +0000
@@ -32,15 +32,16 @@
 
 AM_MAINTAINER_MODE
 
-DRIVER_NAME=calcomp
-AC_SUBST([DRIVER_NAME])
-
+# Require xorg-macros: XORG_CWARNFLAGS, 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)
 AM_CONFIG_HEADER([config.h])
 
 # Checks for programs.
 AC_DISABLE_STATIC
 AC_PROG_LIBTOOL
 AC_PROG_CC
+XORG_CWARNFLAGS
 
 AH_TOP([#include "xorg-server.h"])
 
@@ -77,16 +78,18 @@
 # Checks for pkg-config packages
 PKG_CHECK_MODULES(XORG, [xorg-server >= 1.0.99.901] xproto $REQUIRED_MODULES)
 sdkdir=$(pkg-config --variable=sdkdir xorg-server)
-
-CFLAGS="$CFLAGS $XORG_CFLAGS "' -I$(top_srcdir)/src'
-AC_SUBST([CFLAGS])
+XORG_CFLAGS="$CWARNFLAGS $XORG_CFLAGS"
 
 # Checks for libraries.
 
 # Checks for header files.
 AC_HEADER_STDC
 
+DRIVER_NAME=calcomp
+AC_SUBST([DRIVER_NAME])
+
 XORG_MANPAGE_SECTIONS
 XORG_RELEASE_VERSION
+XORG_CHANGELOG
 
 AC_OUTPUT([Makefile src/Makefile man/Makefile])
diff -ruN xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/man/calcomp.man xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/man/calcomp.man
--- xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/man/calcomp.man	2008-03-20 18:58:52.000000000 +0000
+++ xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/man/calcomp.man	2009-02-02 20:26:25.000000000 +0000
@@ -76,6 +76,6 @@
 sets the level of debugging info reported.
 .RE
 .SH "SEE ALSO"
-__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), xorgconfig(__appmansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
+__xservername__(__appmansuffix__), __xconfigfile__(__filemansuffix__), Xserver(__appmansuffix__), X(__miscmansuffix__).
 .SH AUTHORS
 Martin Kroeker <mk@daveg.com>
diff -ruN xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/src/Makefile.am xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/src/Makefile.am
--- xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/src/Makefile.am	2008-03-20 18:58:52.000000000 +0000
+++ xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/src/Makefile.am	2009-02-02 20:26:25.000000000 +0000
@@ -24,6 +24,8 @@
 # -avoid-version prevents gratuitous .0.0.0 version numbers on the end
 # _ladir passes a dummy rpath to libtool so the thing will actually link
 # TODO: -nostdlib/-Bstatic/-lgcc platform magic, not installing the .a, etc.
+AM_CFLAGS = $(XORG_CFLAGS)
+
 @DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
 @DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
 @DRIVER_NAME@_drv_ladir = @inputdir@
diff -ruN xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/src/xf86Calcomp.c xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/src/xf86Calcomp.c
--- xf86-input-calcomp-6d54cbe6bd4c5f2a4ea54c18dbf04419a45c043b/src/xf86Calcomp.c	2008-03-20 18:58:52.000000000 +0000
+++ xf86-input-calcomp-931367e14637b7afab2b9fd4c18aba227d67ee60/src/xf86Calcomp.c	2009-02-02 20:26:25.000000000 +0000
@@ -132,7 +132,9 @@
         "xf86CollectInputOptions",
         "xf86ErrorFVerb",
         "xf86FindOptionValue",
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
         "xf86GetMotionEvents",
+#endif
         "xf86GetVerbosity",
         "xf86MotionHistoryAllocate",
         "xf86NameCmp",
@@ -308,7 +310,10 @@
 	 * this example device reports motions on 2 axes in absolute coordinates.
 	 * Device may reports touch pressure on the 3rd axis.
 	 */
-	if (InitValuatorClassDeviceStruct (dev, 3, xf86GetMotionEvents,
+	if (InitValuatorClassDeviceStruct (dev, 3,
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 3
+                    xf86GetMotionEvents,
+#endif
 									local->history_size, Absolute) == FALSE)
 	{
 		ErrorF ("Unable to allocate CALCOMP ValuatorClassDeviceStruct\n");