--- orig/configure.ac
+++ mod/configure.ac
@@ -72,8 +72,6 @@
 dnl 
 dnl ------------------------------ SUBDIRS --------------------
 
-AC_CONFIG_SUBDIRS(libffi)
-
 case $ac_configure_args in
   *--enable-subdir) ;;
   *) ac_configure_args="$ac_configure_args --enable-subdir" ;;
@@ -88,7 +86,6 @@
         *) enable_generational_gc=yes ;;
 esac])
 if test $enable_generational_gc != no; then
-  AC_CONFIG_SUBDIRS(sigsegv)
   AC_DEFINE(HAVE_SIGSEGV_H, 1,
     [Define to 1 if libsigsegv is being used])
 fi
--- orig/Makefile.am
+++ mod/Makefile.am
@@ -22,7 +22,7 @@
 PACKAGE=gnu-smalltalk
 gstdatadir=$(pkgdatadir)
 
-DIST_SUBDIRS = lib-src snprintfv lightning sigsegv libffi opcode libgst \
+DIST_SUBDIRS = lib-src snprintfv lightning opcode libgst \
 	. $(ALL_PACKAGES) tests doc
 
 SUBDIRS = lib-src lightning $(subdirs)
@@ -100,7 +100,7 @@
 bin_PROGRAMS = gst
 
 gst_SOURCES = main.c
-gst_LDADD = libgst/libgst.la lib-src/library.la @ICON@
+gst_LDADD = libgst/libgst.la lib-src/library.la @ICON@ /usr/lib/libffi.a
 gst_DEPENDENCIES = libgst/libgst.la lib-src/library.la @ICON@
 gst_LDFLAGS = -export-dynamic
 
@@ -114,7 +114,7 @@
 # we use noinst here.
 noinst_PROGRAMS = gst-tool
 gst_tool_SOURCES = gst-tool.c
-gst_tool_LDADD = libgst/libgst.la lib-src/library.la
+gst_tool_LDADD = libgst/libgst.la lib-src/library.la /usr/lib/libffi.a
 gst_tool_DEPENDENCIES = libgst/libgst.la lib-src/library.la
 gst_tool_LDFLAGS = -export-dynamic
 
--- orig/libgst/cint.c
+++ mod/libgst/cint.c
@@ -55,7 +55,7 @@
 #include "gstpriv.h"
 #include "re.h"
 
-#include "../libffi/include/ffi.h"
+#include "ffi.h"
 #include <ltdl.h>
 
 typedef struct symbol_type_map
--- orig/libgst/Makefile.am
+++ mod/libgst/Makefile.am
@@ -7,8 +7,7 @@
 AM_CPPFLAGS = -DKERNEL_PATH=\"$(pkgdatadir)/kernel\" \
   -DIMAGE_PATH=\"$(imagedir)\" -DMODULE_PATH=\"$(pkglibdir)\" \
   -DLIBEXEC_PATH=\"$(libexecdir)/$(PACKAGE)\" \
-  -I$(top_srcdir)/lib-src -I$(top_srcdir)/libffi/include \
-  -I$(top_builddir)/libffi/include $(INCLIGHTNING) \
+  -I$(top_srcdir)/lib-src $(INCLIGHTNING) \
   @INCSNPRINTFV@ $(INCSIGSEGV) -I$(top_builddir)/lib-src
 
 if !HAVE_INSTALLED_LIGHTNING
@@ -16,10 +15,6 @@
   -I$(top_srcdir) -I$(top_builddir)
 endif
 
-if HAVE_SIGSEGV
-AM_CPPFLAGS += -I$(top_srcdir)/sigsegv/src -I$(top_builddir)/sigsegv/src
-endif
-
 include_HEADERS = gstpub.h gst.h
 lib_LTLIBRARIES = libgst.la
 EXTRA_PROGRAMS = genprims genbc genvm
@@ -28,14 +23,13 @@
 # definitions for libgst.la
 
 libgst_la_LIBADD=$(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@
+	@LIBSNPRINTFV@ @LIBREADLINE@ @LIBGMP@
 
 libgst_la_DEPENDENCIES=$(top_builddir)/lib-src/library.la \
-	$(top_builddir)/libffi/libffi.la @LIBSNPRINTFV@
+	@LIBSNPRINTFV@
 
 if HAVE_SIGSEGV
-libgst_la_LIBADD += $(top_builddir)/sigsegv/src/libsigsegv.la
-libgst_la_DEPENDENCIES += $(top_builddir)/sigsegv/src/libsigsegv.la
+libgst_la_LIBADD += -lsigsegv
 endif
 
 libgst_la_LDFLAGS = -version-info $(VERSION_INFO) -no-undefined \