diff --git a/cadpli/Makefile.in b/cadpli/Makefile.in
index b08b856c9..63c0b5b00 100644
--- a/cadpli/Makefile.in
+++ b/cadpli/Makefile.in
@@ -16,7 +16,7 @@
 #    59 Temple Place - Suite 330
 #    Boston, MA 02111-1307, USA
 #
-#ident "$Id: Makefile.in,v 1.6 2003/10/06 21:27:05 steve Exp $"
+#ident "$Id: Makefile.in,v 1.7 2003/10/09 01:07:20 steve Exp $"
 #
 #
 SHELL = /bin/sh
@@ -48,7 +48,19 @@ CFLAGS = @CFLAGS@
 LDFLAGS = @LDFLAGS@
 STRIP = @STRIP@
 
-all: dep cadpli.vpl
+SHARED = @shared@
+
+all:
+
+ifeq (@enable_vvp32@,yes)
+vpidir32 = $(libdir)/ivl/@vpidir2@
+ALL32 = all32
+INSTALL32 = install32
+UNINSTALL32 = uninistall32
+include $(srcdir)/enable_vvp32.mk
+endif
+
+all: dep cadpli.vpl $(ALL32)
 
 # No specific check operations.
 check: all
@@ -76,7 +88,7 @@ clean:
 distclean: clean
 	rm -f Makefile config.status config.log config.cache
 
-install: all installdirs $(vpidir)/cadpli.vpl
+install: all installdirs $(vpidir)/cadpli.vpl $(INSTALL32)
 
 $(vpidir)/cadpli.vpl: ./cadpli.vpl
 	$(INSTALL_PROGRAM) ./cadpli.vpl $(vpidir)/cadpli.vpl
@@ -84,8 +96,11 @@ $(vpidir)/cadpli.vpl: ./cadpli.vpl
 installdirs: ../mkinstalldirs
 	$(srcdir)/../mkinstalldirs $(vpidir)
 
-uninstall:
+uninstall: $(UNINSTALL32)
 	rm -f $(vpidir)/cadpli.vpl
 
+ifeq (@enable_vvp32@,yes)
+include $(srcdir)/enable_vvp32.mk
+endif
 
 -include $(patsubst %.o, dep/%.d, $O)
diff --git a/cadpli/configure.in b/cadpli/configure.in
index 41d95ad3d..d585b8953 100644
--- a/cadpli/configure.in
+++ b/cadpli/configure.in
@@ -11,6 +11,10 @@ AC_SUBST(EXEEXT)
 
 AC_PROG_INSTALL
 
+# vvp32 is by default disabled
+#enable_vvp32=no
+AC_SUBST(enable_vvp32)
+
 AC_CHECK_HEADERS(malloc.h)
 
 AC_CHECK_SIZEOF(unsigned long long)
@@ -213,6 +217,7 @@ then
 fi
 
 AC_SUBST(vpidir1)
-AC_MSG_RESULT(${vpidir1})
+AC_SUBST(vpidir2)
+AC_MSG_RESULT(${vpidir1} ${vpidir2})
 
 AC_OUTPUT(Makefile)
diff --git a/cadpli/enable_vvp32.mk b/cadpli/enable_vvp32.mk
new file mode 100644
index 000000000..f39aa6d75
--- /dev/null
+++ b/cadpli/enable_vvp32.mk
@@ -0,0 +1,39 @@
+#
+#    This source code is free software; you can redistribute it
+#    and/or modify it in source code form under the terms of the GNU
+#    Library General Public License as published by the Free Software
+#    Foundation; either version 2 of the License, or (at your option)
+#    any later version.
+#
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU Library General Public License for more details.
+#
+#    You should have received a copy of the GNU Library General Public
+#    License along with this program; if not, write to the Free
+#    Software Foundation, Inc.,
+#    59 Temple Place - Suite 330
+#    Boston, MA 02111-1307, USA
+#
+#ident "$Id: enable_vvp32.mk,v 1.1 2003/10/09 01:07:20 steve Exp $"
+#
+
+all32: bin32 bin32/cadpli.vpl
+
+bin32:
+	mkdir bin32
+
+bin32/%.o: %.c
+	$(CC) -m32 -Wall -I$(srcdir) -I$(srcdir)/.. $(CPPFLAGS) $(CFLAGS) -MD -c $< -o $@
+
+bin32/cadpli.vpl: $(addprefix bin32/,$O) ../vvp/bin32/libvpi.a ../libveriuser/bin32/libveriuser.o
+	$(CC) $(SHARED) -m32 -o $@ $(addprefix bin32/,$O) ../libveriuser/bin32/libveriuser.o ../vvp/bin32/libvpi.a
+
+install32: all32 $(vpidir32)/cadpli.vpl
+
+$(vpidir32)/cadpli.vpl: bin32/cadpli.vpl
+	$(INSTALL_PROGRAM) bin32/cadpli.vpl $(vpidir32)/cadpli.vpl
+
+uninstall32:
+	rm -f $(vpidir32)/cadpli.vpl