diff -Nru emacs23-23.4+1/debian/changelog emacs23-23.4+1/debian/changelog
--- emacs23-23.4+1/debian/changelog	2012-09-08 13:01:04.000000000 -0700
+++ emacs23-23.4+1/debian/changelog	2013-02-18 07:46:17.000000000 -0800
@@ -1,3 +1,11 @@
+emacs23 (23.4+1-4+x32) unreleased; urgency=low
+
+  * Add 0019-Backport-x32-support-from-emacs24.patch: Check for __ILP32__
+    on x86_64 and if it's defined, use the i386 machine definitions which
+    match what's required on X32.
+
+ -- Daniel Schepler <schepler@debian.org>  Mon, 18 Feb 2013 07:46:10 -0800
+
 emacs23 (23.4+1-4) unstable; urgency=high
 
   * Add 0018-Don-t-eval-code-when-enable-local-variables-is-safe.patch.
diff -Nru emacs23-23.4+1/debian/patches/0019-Backport-x32-support-from-emacs24.patch emacs23-23.4+1/debian/patches/0019-Backport-x32-support-from-emacs24.patch
--- emacs23-23.4+1/debian/patches/0019-Backport-x32-support-from-emacs24.patch	1969-12-31 16:00:00.000000000 -0800
+++ emacs23-23.4+1/debian/patches/0019-Backport-x32-support-from-emacs24.patch	2013-02-18 07:43:25.000000000 -0800
@@ -0,0 +1,26 @@
+Index: emacs23-23.4+1/configure.in
+===================================================================
+--- emacs23-23.4+1.orig/configure.in	2013-02-18 07:30:14.000000000 -0800
++++ emacs23-23.4+1/configure.in	2013-02-18 07:43:20.000000000 -0800
+@@ -789,6 +789,21 @@
+ if test "x$RANLIB" = x; then
+   AC_PROG_RANLIB
+ fi
++
++## Although we're running on an amd64 kernel, we're actually compiling for
++## the x86 architecture. The user should probably have provided an
++## explicit --build to `configure', but if everything else than the kernel
++## is running in i386 mode, we can help them out.
++if test "$machine" = "amdx86-64"; then
++  AC_CHECK_DECL([i386])
++  if test "$ac_cv_have_decl_i386" = "yes"; then
++    canonical=`echo "$canonical" | sed -e 's/^amd64/i386/' -e 's/^x86_64/i386/'`
++    machine=intel386
++    machfile="m/${machine}.h"
++  fi
++  AC_CHECK_DECL([__ILP32__], [machfile="m/intel386.h"])
++fi
++
+ AC_PATH_PROG(INSTALL_INFO, install-info)
+ AC_PATH_PROG(INSTALL_INFO, install-info,, /usr/sbin)
+ AC_PATH_PROG(INSTALL_INFO, install-info,:, /sbin)
diff -Nru emacs23-23.4+1/debian/patches/series emacs23-23.4+1/debian/patches/series
--- emacs23-23.4+1/debian/patches/series	2012-09-08 12:58:21.000000000 -0700
+++ emacs23-23.4+1/debian/patches/series	2013-02-18 07:40:01.000000000 -0800
@@ -16,3 +16,4 @@
 0016-quail-indian.el-indian-tlg-base-table-Fix-typo-dev-t.patch
 0017-Initialize-xgselect-in-function-xg_select-when-gfds_.patch
 0018-Don-t-eval-code-when-enable-local-variables-is-safe.patch
+0019-Backport-x32-support-from-emacs24.patch