diff --git a/configure.in b/configure.in
index f9dd8496e558be862555db1799e486e0f8cb6dca..21bb42dd5ab08bb7390d39875d9d95ac26e133e9 100644
--- a/configure.in
+++ b/configure.in
@@ -280,10 +280,41 @@ esac
 AM_CONDITIONAL(HAVE_MACOSX,test "x$have_macosx" = xyes)
 
 
+dnl Check for NAS
+
+AC_ARG_ENABLE(nas, [  --enable-nas            include NAS output plugin ],
+[ BUILD_NAS="$enableval" ],[ BUILD_NAS="yes" ])
+
+have_nas="no"
+if test "$BUILD_NAS" = "yes"; then
+   AC_PATH_XTRA
+   AC_CHECK_LIB(Xau, XauFileName, have_nas=yes, have_nas=no, $X_LIBS)
+   AC_CHECK_LIB(audio, AuOpenServer, dummy="no-op", have_nas=no, -lXau $X_LIBS)
+   
+   ac_save_CPPFLAGS="$CPPFLAGS"
+   CPPFLAGS="$CPPFLAGS $X_CFLAGS"
+   AC_CHECK_HEADER(audio/audiolib.h, dummy="no-op", have_nas=no)
+   CPPFLAGS="$ac_save_CPPFLAGS"
+fi
+
+AM_CONDITIONAL(HAVE_NAS,test "x$have_nas" = xyes)
+
+if test "x$have_nas" = xyes; then
+	NAS_CFLAGS="$X_CFLAGS"
+	NAS_LIBS="-laudio -lXau $X_LIBS"
+else
+	NAS_CFLAGS=""
+	NAS_LIBS=""
+fi
+AC_SUBST(NAS_CFLAGS)
+AC_SUBST(NAS_LIBS)
+
+
 dnl Orphaned driver.  We'll probably dump it soon.
 AM_CONDITIONAL(HAVE_SOLARIS,test "x$have_solaris" = xyes)
 
 dnl Plugins get special LDFLAGS
 AC_SUBST(PLUGIN_LDFLAGS)
 
-AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/alsa09/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile debian/Makefile)
+
+AC_OUTPUT(Makefile src/Makefile doc/Makefile include/Makefile include/ao/Makefile include/ao/os_types.h src/plugins/Makefile src/plugins/esd/Makefile src/plugins/oss/Makefile src/plugins/alsa/Makefile src/plugins/alsa09/Makefile src/plugins/sun/Makefile src/plugins/irix/Makefile src/plugins/arts/Makefile src/plugins/macosx/Makefile src/plugins/nas/Makefile debian/Makefile)
diff --git a/src/plugins/Makefile.am b/src/plugins/Makefile.am
index cd2f296108c5f4191b4aa821149db7f81913ab0d..f4b1fd5941e355806b002573a837ec48211e61e1 100644
--- a/src/plugins/Makefile.am
+++ b/src/plugins/Makefile.am
@@ -1,4 +1,4 @@
 ## Process this file with automake to produce Makefile.in
 
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = oss esd arts alsa alsa09 sun irix macosx
+SUBDIRS = oss esd arts alsa alsa09 sun irix macosx nas