diff --git a/Makefile.in b/Makefile.in
index 30292dec7..f13a5615e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -37,11 +37,17 @@ exec_prefix = @exec_prefix@
 srcdir = @srcdir@
 datarootdir = @datarootdir@
 
-SUBDIRS = ivlpp vhdlpp vvp vpi libveriuser cadpli tgt-null tgt-stub tgt-vvp \
+SUBDIRS = ivlpp vhdlpp vvp vpi tgt-null tgt-stub tgt-vvp \
           tgt-vhdl tgt-vlog95 tgt-pcb tgt-blif tgt-sizer driver
 # Only run distclean for these directories.
 NOTUSED = tgt-fpga tgt-pal tgt-verilog
 
+ifeq (@LIBVERIUSER@,yes)
+SUBDIRS += libveriuser cadpli
+else
+NOTUSED += libveriuser cadpli
+endif
+
 ifeq (@MINGW32@,yes)
 SUBDIRS += driver-vpi
 else
@@ -228,6 +234,7 @@ all: iverilog-vpi
 
 iverilog-vpi: $(srcdir)/iverilog-vpi.sh Makefile
 	sed -e 's;@SHARED@;@shared@;' -e 's;@PIC@;@PICFLAG@;' \
+	    -e 's;@ENABLE_PLI1@;@LIBVERIUSER@;' \
 	    -e 's;@SUFFIX@;$(suffix);' \
 	    -e 's;@IVCC@;$(CC);' \
 	    -e 's;@IVCXX@;$(CXX);' \
diff --git a/configure.ac b/configure.ac
index ce1ff0719..8188f10f5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,7 @@ AC_SUBST(HAVE_LIBBZ2)
 AC_FUNC_ALLOCA
 AC_FUNC_FSEEKO
 
-# Package Options
+# Feature Options
 # ---------------
 
 # Build VVP as a library and stub
@@ -185,6 +185,14 @@ AC_ARG_ENABLE([libvvp],
     [AS_HELP_STRING([--enable-libvvp], [build VVP as a shared library])],
     [AC_SUBST(LIBVVP, yes)],[])
 
+AC_ARG_ENABLE([libveriuser],
+    [AS_HELP_STRING([--enable-libveriuser], [include support for PLI 1 (deprecated)])],
+    [AC_SUBST(LIBVERIUSER, yes)],
+    [AC_SUBST(LIBVERIUSER, no)])
+
+# Package Options
+# ---------------
+
 # valgrind checks
 AC_ARG_WITH([valgrind], [AS_HELP_STRING([--with-valgrind],[Add valgrind hooks])],
             [], [check_valgrind=yes])
diff --git a/driver-vpi/Makefile.in b/driver-vpi/Makefile.in
index 834c54860..799dcf591 100644
--- a/driver-vpi/Makefile.in
+++ b/driver-vpi/Makefile.in
@@ -84,6 +84,11 @@ config.h: $(srcdir)/config.h.in Makefile
 	    -e 's;@IVLCFLAGS@;$(CFLAGS);' \
 	    -e 's;@IVLCXXFLAGS@;$(CXXFLAGS);' \
 	    -e 's;@SHARED@;@shared@;' $< > $@
+ifeq (@LIBVERIUSER@,yes)
+	sed -i 's;@VPILIBS@;-lveriuser$(suffix) -lvpi$(suffix);' $@
+else
+	sed -i 's;@VPILIBS@;-lvpi$(suffix);' $@
+endif
 
 # Windows specific...
 res.rc: $(srcdir)/res.rc.in ../version.exe
diff --git a/driver-vpi/config.h.in b/driver-vpi/config.h.in
index 2b6789dd4..4a2fca81f 100644
--- a/driver-vpi/config.h.in
+++ b/driver-vpi/config.h.in
@@ -6,5 +6,5 @@
 #define IVERILOG_VPI_CFLAGS    " @IVLCFLAGS@"
 #define IVERILOG_VPI_CXXFLAGS  " @IVLCXXFLAGS@"
 #define IVERILOG_VPI_LDFLAGS   "@SHARED@"
-#define IVERILOG_VPI_LDLIBS    "-lveriuser@SUFFIX@ -lvpi@SUFFIX@"
+#define IVERILOG_VPI_LDLIBS    "@VPILIBS@"
 #define IVERILOG_SUFFIX        "@SUFFIX@"
diff --git a/iverilog-vpi.sh b/iverilog-vpi.sh
index 197d6b3d0..10083ab89 100644
--- a/iverilog-vpi.sh
+++ b/iverilog-vpi.sh
@@ -29,7 +29,11 @@ SUFFIX=@SUFFIX@
 # These are used for linking...
 LD=$CC
 LDFLAGS="@IVCTARGETFLAGS@ @SHARED@ -L@LIBDIR@"
-LDLIBS="-lveriuser$SUFFIX -lvpi$SUFFIX"
+if [ x@ENABLE_PLI1@ = xyes ] ; then
+    LDLIBS="-lveriuser$SUFFIX -lvpi$SUFFIX"
+else
+    LDLIBS="-lvpi$SUFFIX"
+fi
 
 CCSRC=
 CXSRC=