diff -u cvs-1.12.13+real/configure.in cvs-1.12.13+real/configure.in
--- cvs-1.12.13+real/configure.in
+++ cvs-1.12.13+real/configure.in
@@ -20,6 +20,7 @@
 AC_CONFIG_SRCDIR(src/cvs.h)
 AC_CONFIG_AUX_DIR(build-aux)
 AM_INIT_AUTOMAKE([gnu 1.9.2 dist-bzip2 no-define])
+AM_GNU_GETTEXT_VERSION([0.14.4])
 AC_PREREQ(2.59)
 
 AC_PREFIX_PROGRAM(cvs)
diff -u cvs-1.12.13+real/debian/changelog cvs-1.12.13+real/debian/changelog
--- cvs-1.12.13+real/debian/changelog
+++ cvs-1.12.13+real/debian/changelog
@@ -1,3 +1,10 @@
+cvs (2:1.12.13+real-9+x32+1) unreleased; urgency=low
+
+  * Use dh-autoreconf to regenerate configure script and avoid unnecessary
+    compilation of mktime.c, which doesn't work on x32 as is.
+
+ -- Daniel Schepler <schepler@debian.org>  Fri, 25 Jan 2013 10:22:19 -0800
+
 cvs (2:1.12.13+real-9) unstable; urgency=low
 
   * Fix watch file: mange Epoch away, too
diff -u cvs-1.12.13+real/debian/control cvs-1.12.13+real/debian/control
--- cvs-1.12.13+real/debian/control
+++ cvs-1.12.13+real/debian/control
@@ -7,7 +7,8 @@
 Homepage: http://www.nongnu.org/cvs/
 Build-Depends: debhelper (>= 5), autotools-dev, bsdmainutils, groff,
  libbsd-dev, libkrb5-dev | heimdal-dev, texi2html, texinfo,
- texlive-latex-base, zlib1g-dev
+ texlive-latex-base, texlive-latex-recommended, zlib1g-dev,
+ dh-autoreconf, autopoint
 Standards-Version: 3.9.3
 # First word is the $CVSROOT (-d arg) string, second word the module.
 Vcs-CVS: :ext:_anoncvs@anoncvs.mirbsd.org:/cvs contrib/hosted/tg/deb/cvs
diff -u cvs-1.12.13+real/debian/rules cvs-1.12.13+real/debian/rules
--- cvs-1.12.13+real/debian/rules
+++ cvs-1.12.13+real/debian/rules
@@ -35,9 +35,6 @@
 CONFIGURE_ENV+=		LIBS='${LIBS}'
 CONFIGURE_ENV+=		CSH=/bin/csh
 
-# check takes forever, so assume the safe choice
-CONFIGURE_ENV+=		ac_cv_func_working_mktime=no
-
 CONFIGURE_ARGS:=	--prefix=/usr \
 			--infodir=/usr/share/info \
 			--mandir=/usr/share/man \
@@ -74,12 +71,14 @@
 			doc/cvs.1 doc/cvs.info* doc/cvsclient.info* \
 			doc/cvs.pdf doc/cvsclient.pdf \
 			doc/getdate-cvs.texi \
-			vms/config.h windows-NT/config.h
+			vms/config.h windows-NT/config.h \
+			m4/mktime.m4
 
 debian/.configure_stamp:
 	dh_testdir
 	-rm -rf ${CLEANFILES}
-	cp /usr/share/misc/config.guess /usr/share/misc/config.sub build-aux/
+	dh_autoreconf
+	#cp /usr/share/misc/config.guess /usr/share/misc/config.sub build-aux/
 	mkdir debian/builddir debian/stagedir
 	cd debian/builddir && \
 	    env ${CONFIGURE_ENV} sh ../../configure ${CONFIGURE_ARGS}
@@ -96,6 +95,7 @@
 clean:
 	dh_testdir
 	-rm -rf ${CLEANFILES}
+	dh_autoreconf_clean
 	dh_clean
 
 binary-indep: