diff --git a/Makefile.am b/Makefile.am
index 6344b4e..5f0c74d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,7 +48,7 @@ AM_YFLAGS = --warnings=all -d
 lib_LTLIBRARIES = libjq.la
 libjq_la_SOURCES = ${LIBJQ_SRC}
 libjq_la_LIBADD = -lm
-libjq_la_LDFLAGS = $(onig_LDFLAGS) -export-symbols-regex '^j[qv]_' -version-info 1:4:0
+libjq_la_LDFLAGS = -export-symbols-regex '^j[qv]_' -version-info 1:4:0
 
 if WIN32
 libjq_la_LIBADD += -lshlwapi
@@ -137,15 +137,6 @@ jq.1: $(srcdir)/jq.1.prebuilt
 endif
 
 
-### Build oniguruma
-
-if BUILD_ONIGURUMA
-libjq_la_LIBADD += modules/oniguruma/src/.libs/libonig.la
-SUBDIRS = modules/oniguruma
-endif
-
-AM_CFLAGS += $(onig_CFLAGS)
-
 ### Packaging
 
 docs/site.yml: configure.ac
diff --git a/configure.ac b/configure.ac
index 280694c..0c5d86f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -236,45 +236,20 @@ AC_ARG_WITH([oniguruma],
       [try this for a non-standard install prefix of the oniguruma library])], ,
    [with_oniguruma=yes])
 
-onig_CFLAGS=
-onig_LDFLAGS=
-build_oniguruma=no
 AS_IF([test "x$with_oniguruma" != xno], [
    save_CFLAGS="$CFLAGS"
    save_LDFLAGS="$LDFLAGS"
-   AS_IF([test "x$with_oniguruma" != xyes], [
-      AS_IF([test "x$with_oniguruma" = xbuiltin], [
-          build_oniguruma=yes
-      ], [
-          onig_CFLAGS="-I${with_oniguruma}/include"
-          onig_LDFLAGS="-L${with_oniguruma}/lib"
-      ])
-   ])
    AS_IF([test "x$build_oniguruma" = xno], [
        # check for ONIGURUMA library, either in /usr or where requested
-       CFLAGS="$CFLAGS $onig_CFLAGS"
-       LDFLAGS="$LDFLAGS $onig_LDFLAGS"
        AC_CHECK_HEADER("oniguruma.h",
           AC_CHECK_LIB([onig],[onig_version]))
        # handle check results
        AS_IF([test "x$ac_cv_lib_onig_onig_version" != "xyes"], [
-          build_oniguruma=yes
-          AC_MSG_NOTICE([Oniguruma was not found. Will use the packaged oniguruma.])
+          AC_MSG_ERROR(oniguruma.h not found)
        ])
    ])
-   AS_IF([test "x$build_oniguruma" = xyes -a -f "${srcdir}/modules/oniguruma/configure.ac" ], [
-       onig_CFLAGS="-I${srcdir}/modules/oniguruma/src"
-       onig_LDFLAGS="-L${srcdir}/modules/oniguruma/src -Wl,-rpath,${libdir}"
-       AC_CONFIG_SUBDIRS([modules/oniguruma])
-       AC_DEFINE([HAVE_LIBONIG],1,[Define to 1 if the system includes libonig])
-   ])
-   CFLAGS="$save_CFLAGS"
-   LDFLAGS="$save_LDFLAGS"
 ])
-AC_SUBST(onig_CFLAGS)
-AC_SUBST(onig_LDFLAGS)
 
-AM_CONDITIONAL([BUILD_ONIGURUMA], [test "x$build_oniguruma" = xyes])
 AC_SUBST([BUNDLER], ["$bundle_cmd"])
 
 AC_CONFIG_MACRO_DIR([config/m4])