diff --git a/Makefile.am b/Makefile.am
index 77d89ec68..c50cbe773 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = ac FexTrackerSource aegisub locale
+SUBDIRS = ac FexTrackerSource csri aegisub locale
 
 lua51/src/liblua.a:
 	make -C lua51/src CC=$(CXX) a
diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am
index 1a3305a8c..da3f1385b 100644
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@@ -11,7 +11,7 @@ REVISION := $(if $(SVNREV),-DBUILD_SVN_REVISION=$(SVNREV)) $(if $(DARCSREV),-DBU
 BUILDINFO := -DBUILD_CREDIT="\"$(shell whoami)\"" $(REVISION)
 
 AM_CPPFLAGS = -DAEGISUB -Iposix -include posix/defines.h $(BUILDINFO)
-LDADD = posix/libposix.a ../lua51/src/liblua.a ../FexTrackerSource/libfex.a -lGL -lGLU
+LDADD = posix/libposix.a ../lua51/src/liblua.a ../FexTrackerSource/libfex.a ../csri/lib/.libs/libcsri.a -lGL -lGLU
 
 #	auto4_ruby_assfile.cpp
 #	auto4_ruby.cpp
diff --git a/aegisub/beautify b/aegisub/beautify
new file mode 100755
index 000000000..792e237ea
--- /dev/null
+++ b/aegisub/beautify
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sed -e 's%\t\(if $(\(CXX\|\)COMPILE)\)%\t@echo -e "\\033[32;1m$@\\033[m";\1%' -i.orig Makefile
diff --git a/aegisub/subtitles_provider_csri.cpp b/aegisub/subtitles_provider_csri.cpp
index f5d25c6c7..7ce39fb46 100644
--- a/aegisub/subtitles_provider_csri.cpp
+++ b/aegisub/subtitles_provider_csri.cpp
@@ -96,6 +96,8 @@ CSRISubtitlesProvider::~CSRISubtitlesProvider() {
 //////////////////
 // Load subtitles
 void CSRISubtitlesProvider::LoadSubtitles(AssFile *subs) {
+	csri_rend *renderer;
+
 	// Close
 	if (instance) csri_close(instance);
 	instance = NULL;
@@ -109,7 +111,9 @@ void CSRISubtitlesProvider::LoadSubtitles(AssFile *subs) {
 
 	// Open
 	//instance = csri_open_file(csri_renderer_default(),subsfilename.mb_str(wxConvUTF8),NULL);
-	instance = csri_open_mem(csri_renderer_default(),&data[0],data.size(),NULL);
+	renderer = csri_renderer_default();
+	if (renderer)
+		instance = csri_open_mem(renderer,&data[0],data.size(),NULL);
 }
 
 
diff --git a/autogen.sh b/autogen.sh
index 36d0bda55..030da8ab5 100644
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,4 +1,4 @@
 #!/bin/sh
 
-aclocal && autoheader && automake -a && autoconf && echo "'configure' script created successfully."
+autoreconf -f -i -s
 
diff --git a/configure.ac b/configure.ac
index 60e9fdd41..2a29f04d9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -127,13 +127,6 @@ AC_CHECK_LIB([portaudio], [Pa_Initialize],, [AC_MSG_ERROR([portaudio not found.]
 AC_CHECK_LIB([avcodec], [avcodec_init])
 AC_CHECK_LIB([avformat], [av_read_frame])
 
-PKG_CHECK_MODULES([ASA], asa >= 0.3.2, [
-	CPPFLAGS="$CPPFLAGS $ASA_CFLAGS"
-	LIBS="$LIBS $ASA_LIBS"
-	AC_DEFINE(HAVE_ASA, 1, [found asa via pkg-config])
-], [true])
-AC_CHECK_HEADERS([asa/asa.h])
-
 PKG_CHECK_MODULES([LIBASS], libass >= 0.9.1, [
 	CPPFLAGS="$CPPFLAGS $LIBASS_CFLAGS"
 	LIBS="$LIBS $LIBASS_LIBS"
@@ -183,6 +176,7 @@ AC_PATH_XTRA
 AC_HEADER_STDC
 AC_HEADER_STDBOOL
 
+AC_CONFIG_SUBDIRS([csri])
 
 AC_OUTPUT([
 	Makefile