diff --git a/aegisub/configure.in b/aegisub/configure.in
index 99db4e057..d05317d74 100644
--- a/aegisub/configure.in
+++ b/aegisub/configure.in
@@ -22,6 +22,7 @@ m4_define([libpostproc_required_version], [51.1.0])
 m4_define([lua_auto3_required_version], [5.0])
 m4_define([lua_auto4_required_version], [5.1])
 m4_define([portaudio_required_version], [1])
+m4_define([portaudio2_required_version], [19])
 m4_define([pulseaudio_required_version], [0.5])
 
 m4_define([fontconfig_required_version], [2.4])
@@ -460,6 +461,40 @@ AC_SUBST(PORTAUDIO_LDFLAGS)
 AC_SUBST(PORTAUDIO_CFLAGS)
 
 
+
+###################
+## PortAudio2 (v19)
+###################
+
+AC_ARG_WITH(portaudio2,[  --without-portaudio2    build without PortAudio v19 audio provider.
+                          (default: auto)], pulseaudio_disabled="(disabled)")
+if test "$with_portaudio2" != "no"; then
+  PKG_CHECK_MODULES(PORTAUDIO2, portaudio-2.0 >= portaudio2_required_version, [with_portaudio2="yes"], [with_portaudio2="no"])
+fi
+
+if test "$with_portaudio2" != "no"; then
+  AC_AGI_COMPILE([PortAudio2], [portaudio], [$LIBPORTAUDIO2_CFLAGS], [$LIBPORTAUDIO2_LIBS],[
+#include <portaudio.h>
+int main(void) {
+  PaError err = Pa_Initialize();
+  if (err != paNoError) return 1;
+  return 0;
+} ])
+fi
+
+if test "$agi_cv_with_portaudio2" = "no" && test "$with_portaudio2" = "yes"; then
+  AC_MSG_WARN([PortAudio2 detected, but it doesn't work...])
+  with_portaudio2="no"
+fi
+
+if test "$agi_cv_with_portaudio2" = "yes" && test "$with_portaudio2" = "yes"; then
+  AC_DEFINE(WITH_PORTAUDIO2, 1, [Enable PortAudio v19 support])
+  found_audio="yes"
+fi
+
+AM_CONDITIONAL([HAVE_PORTAUDIO2], [test "$with_portaudio2" != "no"])
+
+
 #############
 ## PulseAudio
 #############
@@ -635,6 +670,9 @@ AC_ARG_WITH(provider-ffmpegsource, [  --without-provider-ffmpegsource
                           build without FFmpegSource A/V provider.
                           (default: auto)], ffmpegsource_provider_disabled="(disabled)", with_provider_ffmpegsource="yes")
 
+# XXX: Fix this to be a proper check.
+AC_CHECK_HEADER([libavutil/pixfmt.h],,[AC_MSG_WARN([FFmpegSource2 requires FFMPEG r18129 or newer]); with_provider_ffmpegsource="no"])
+
 if test "$agi_cv_with_ffmpeg" = "yes" && test "$with_provider_ffmpegsource" = "yes"; then
   PKG_CHECK_MODULES(LIBPOSTPROC,  libpostproc >= libpostproc_required_version, [], [with_libpostproc="no"])
 
@@ -661,15 +699,10 @@ else
   with_provider_ffmpegsource="no"
 fi
 
+AM_CONDITIONAL([HAVE_PROVIDER_FFMPEGSOURCE], [test "$with_provider_ffmpegsource" = "yes"])
 AC_SUBST(LIBPOSTPROC_LIBS)
 AC_SUBST(LIBPOSTPROC_CFLAGS)
 
-# XXX: Fix this to be a proper check.
-AC_CHECK_HEADER([libavutil/pixfmt.h],,[AC_MSG_WARN([FFmpegSource2 requires FFMPEG r18129 or newer]); with_provider_ffmpegsource="no"])
-
-AM_CONDITIONAL([HAVE_PROVIDER_FFMPEGSOURCE], [test "$with_provider_ffmpegsource" = "yes"])
-
-
 
 ###################
 # Subtitle Provider