diff --git a/Makefile.in b/Makefile.in
index 80127b0e9..566e24a41 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.154 2003/09/19 03:30:04 steve Exp $"
+#ident "$Id: Makefile.in,v 1.155 2003/10/13 20:57:34 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -40,6 +40,8 @@ libdir = @libdir@
 includedir = @includedir@
 mandir = @mandir@
 
+libdir64 = @libdir64@
+
 dllib=@DLLIB@
 rdynamic=@rdynamic@
 strip_dynamic=@strip_dynamic@
@@ -156,7 +158,9 @@ ifeq (@WIN32@,yes)
 else
 iverilog-vpi: iverilog-vpi.sh
 	sed -e 's;@SHARED@;@shared@;' -e 's;@PIC@;@PICFLAG@;' \
-	    -e 's;@INCLUDEDIR@;@includedir@;' -e 's;@LIBDIR@;@libdir@;' $< > $@
+	    -e 's;@INCLUDEDIR@;@includedir@;' \
+	    -e 's;@LIBDIR64@;@libdir64@;' \
+	    -e 's;@LIBDIR@;@libdir@;' $< > $@
 	chmod +x $@
 endif
 
diff --git a/configure.in b/configure.in
index 198060b6f..037525fa9 100644
--- a/configure.in
+++ b/configure.in
@@ -268,6 +268,16 @@ esac
 AC_SUBST(ident_support)
 AC_MSG_RESULT($ident_support)
 
+# If not otherwise specified, set the libdir64 variable
+# to the same as libdir.
+AC_MSG_CHECKING(for libdir64 path)
+if test x${libdir64} = x
+then
+	libdir64="${libdir}"
+fi
+AC_SUBST(libdir64)
+AC_MSG_RESULT(${libdir64})
+
 # where to put vpi subdirectories
 AC_MSG_CHECKING(for VPI subdirectories)
 if test x${vpidir1} = x
diff --git a/iverilog-vpi.sh b/iverilog-vpi.sh
index d6467abb9..87778b7dd 100644
--- a/iverilog-vpi.sh
+++ b/iverilog-vpi.sh
@@ -17,7 +17,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: iverilog-vpi.sh,v 1.10 2003/08/26 04:45:47 steve Exp $"
+#ident "$Id: iverilog-vpi.sh,v 1.11 2003/10/13 20:57:34 steve Exp $"
 
 # These are the variables used for compiling files
 CC=gcc
@@ -26,7 +26,9 @@ CFLAGS="@PIC@ -O -I@INCLUDEDIR@"
 
 # These are used for linking...
 LD=gcc
-LDFLAGS="@SHARED@ -L@LIBDIR@"
+LDFLAGS32="@SHARED@ -L@LIBDIR@"
+LDFLAGS64="@SHARED@ -L@LIBDIR64@"
+LDFLAGS="$LDFLAGS64"
 LDLIBS="-lveriuser -lvpi"
 
 CCSRC=
@@ -69,6 +71,10 @@ do
     -l*) LIB="$LIB $parm"
 	 ;;
 
+    -m32) LDFLAGS="-m32 $LDFLAGS32"
+	  CFLAGS="-m32 $CFLAGS"
+	  ;;
+
     --cflags)
 	 echo "$CFLAGS"
 	 exit;