diff -Nru nss-3.14.1.with.ckbi.1.93/debian/changelog nss-3.14.1.with.ckbi.1.93/debian/changelog
--- nss-3.14.1.with.ckbi.1.93/debian/changelog	2013-01-04 02:16:34.000000000 -0800
+++ nss-3.14.1.with.ckbi.1.93/debian/changelog	2013-01-28 23:01:14.000000000 -0800
@@ -1,3 +1,9 @@
+nss (2:3.14.1.with.ckbi.1.93-1+x32) unreleased; urgency=low
+
+  * debian/patches/38_x32.patch, debian/rules: Add x32 support.
+
+ -- Daniel Schepler <schepler@debian.org>  Mon, 28 Jan 2013 23:01:07 -0800
+
 nss (2:3.14.1.with.ckbi.1.93-1) unstable; urgency=low
 
   * New upstream release.
diff -Nru nss-3.14.1.with.ckbi.1.93/debian/patches/38_x32.patch nss-3.14.1.with.ckbi.1.93/debian/patches/38_x32.patch
--- nss-3.14.1.with.ckbi.1.93/debian/patches/38_x32.patch	1969-12-31 16:00:00.000000000 -0800
+++ nss-3.14.1.with.ckbi.1.93/debian/patches/38_x32.patch	2013-01-28 22:51:51.000000000 -0800
@@ -0,0 +1,59 @@
+Index: nss-3.14.1.with.ckbi.1.93/mozilla/security/coreconf/Linux.mk
+===================================================================
+--- nss-3.14.1.with.ckbi.1.93.orig/mozilla/security/coreconf/Linux.mk	2013-01-29 06:44:57.000000000 +0000
++++ nss-3.14.1.with.ckbi.1.93/mozilla/security/coreconf/Linux.mk	2013-01-29 06:49:31.000000000 +0000
+@@ -33,6 +33,10 @@
+ ifeq ($(OS_TEST),x86_64)
+ ifeq ($(USE_64),1)
+ 	CPU_ARCH	= x86_64
++	ARCHFLAG	= -m64
++else ifeq ($(USE_x32),1)
++	CPU_ARCH	= x86_64
++	ARCHFLAG	= -mx32
+ else
+ 	OS_REL_CFLAGS	= -Di386
+ 	CPU_ARCH	= x86
+Index: nss-3.14.1.with.ckbi.1.93/mozilla/security/nss/lib/freebl/Makefile
+===================================================================
+--- nss-3.14.1.with.ckbi.1.93.orig/mozilla/security/nss/lib/freebl/Makefile	2012-11-14 01:14:10.000000000 +0000
++++ nss-3.14.1.with.ckbi.1.93/mozilla/security/nss/lib/freebl/Makefile	2013-01-29 06:51:48.000000000 +0000
+@@ -97,6 +97,8 @@
+         DEFINES += -DNSS_X86_OR_X64
+ ifdef USE_64
+         DEFINES += -DNSS_X64
++else ifdef USE_x32
++	DEFINES += -DNSS_X64
+ else
+         DEFINES += -DNSS_X86
+ endif
+@@ -179,16 +181,20 @@
+ 
+ ifeq ($(OS_TARGET),Linux)
+ ifeq ($(CPU_ARCH),x86_64)
+-    ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
+-    ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
+-    DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
+-    DEFINES += -DNSS_USE_COMBA
+-    DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
+-#   DEFINES += -DMPI_AMD64_ADD
+-    # comment the next two lines to turn off intel HW accelleration
+-    DEFINES += -DUSE_HW_AES
+-    ASFILES += intel-aes.s
+-    MPI_SRCS += mpi_amd64.c mp_comba.c
++    ifeq ($(USE_x32),1)
++        DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
++    else
++        ASFILES  = arcfour-amd64-gas.s mpi_amd64_gas.s
++        ASFLAGS += -march=opteron -m64 -fPIC -Wa,--noexecstack
++        DEFINES += -DNSS_BEVAND_ARCFOUR -DMPI_AMD64 -DMP_ASSEMBLY_MULTIPLY
++        DEFINES += -DNSS_USE_COMBA
++        DEFINES += -DMP_CHAR_STORE_SLOW -DMP_IS_LITTLE_ENDIAN
++#       DEFINES += -DMPI_AMD64_ADD
++        # comment the next two lines to turn off intel HW accelleration
++        DEFINES += -DUSE_HW_AES
++        ASFILES += intel-aes.s
++        MPI_SRCS += mpi_amd64.c mp_comba.c
++    endif
+ endif
+ ifeq ($(CPU_ARCH),x86)
+     ASFILES  = mpi_x86.s
diff -Nru nss-3.14.1.with.ckbi.1.93/debian/patches/series nss-3.14.1.with.ckbi.1.93/debian/patches/series
--- nss-3.14.1.with.ckbi.1.93/debian/patches/series	2013-01-04 02:11:51.000000000 -0800
+++ nss-3.14.1.with.ckbi.1.93/debian/patches/series	2013-01-28 23:04:32.000000000 -0800
@@ -1,5 +1,6 @@
 38_hurd.patch
 38_kbsd.patch
+38_x32.patch
 80_security_tools.patch
 85_security_load.patch
 95_add_spi+cacert_ca_certs.patch
diff -Nru nss-3.14.1.with.ckbi.1.93/debian/rules nss-3.14.1.with.ckbi.1.93/debian/rules
--- nss-3.14.1.with.ckbi.1.93/debian/rules	2013-01-04 02:11:51.000000000 -0800
+++ nss-3.14.1.with.ckbi.1.93/debian/rules	2013-01-28 23:00:15.000000000 -0800
@@ -22,6 +22,8 @@
 
 ifneq (,$(filter 64 alpha amd64 ia64 s390x,$(shell dpkg-architecture -qDEB_BUILD_ARCH_BITS 2> /dev/null || dpkg-architecture -qDEB_BUILD_ARCH)))
 USE_64 := USE_64=1
+else ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH),x32)
+USE_64 := USE_x32=1
 else
 USE_64 :=
 endif