diff --git a/aegisub/Makefile.am b/aegisub/Makefile.am
index 85b51b8b3..de71908bd 100644
--- a/aegisub/Makefile.am
+++ b/aegisub/Makefile.am
@@ -100,7 +100,7 @@ endif
 if HAVE_UNIVCHARDET
 noinst_LIBRARIES += libmisc_universalchardet.a
 libmisc_universalchardet_a_SOURCES = charset_detect.cpp text_file_reader.cpp
-libmisc_universalchardet_a_CPPFLAGS = -D_X86_ -DTEXT_READER_USE_STDIO
+libmisc_universalchardet_a_CPPFLAGS = -D_X86_
 aegisub_LDADD += libmisc_universalchardet.a ../universalchardet/libuniversalchardet.a
 else
 UNIVCHARSET = charset_detect.cpp text_file_reader.cpp
diff --git a/configure.in b/configure.in
index dd2beec1c..bef7361f5 100644
--- a/configure.in
+++ b/configure.in
@@ -319,8 +319,8 @@ fi
 ######################
 ## universalchardetect
 ######################
-AC_ARG_ENABLE(univchardet, [  --enable-univchardet    enable universalchardet support.], univchardet_disabled="(disabled)")
-if test "$with_univchardet" = "yes"; then
+AC_ARG_ENABLE(univchardet, [  --disable-univchardet    diable universalchardet support.], univchardet_disabled="(disabled)")
+if test "$enable_univchardet" != "no"; then
   with_univchardet="yes"
   AC_DEFINE(WITH_UNIVCHARDET, 1, [Enable universalchardet support])
 else
@@ -688,5 +688,5 @@ Subtitle Providers:
 
 Misc Packages:
   hunspell:              $with_hunspell $hunspell_disabled
-  universalchardet:      $with_univchardet $univchardet_disabled (broken)
+  universalchardet:      $with_univchardet $univchardet_disabled
 ]);