diff --git a/README.md b/README.md
index 2bb3358f5..e28366617 100644
--- a/README.md
+++ b/README.md
@@ -45,9 +45,12 @@ Nothing older than Xcode 5 has been tested recently, but it is likely that some
 
 For personal usage, you can use homebrew to install almost all of Aegisub's dependencies:
 
-	brew install boost --c++11 --with-icu4c
-	brew install autoconf ffmpeg freetype ffms2 fftw fribidi libass
+	brew install autoconf ffmpeg freetype gettext ffms2 fftw fribidi libass m4
 	brew install --devel --with-gc64 luajit
+	brew install --HEAD icu4c
+	brew link --force icu4c
+	brew link --force gettext
+	brew install --HEAD --c++11 --with-icu4c boost
 
 wxWidgets is located in vendor/wxWidgets, and can be built like so:
 
@@ -55,7 +58,7 @@ wxWidgets is located in vendor/wxWidgets, and can be built like so:
 	./configure --disable-aboutdlg --disable-animatectrl --disable-aui --disable-any \
 	--disable-bannerwindow --disable-base64 --disable-calendar --disable-caret \
 	--disable-cmdline --disable-colourpicker --disable-compat28 --disable-config \
-	--disable-constraints --disable-datepick --disable-dctransform --disable-debureport \
+	--disable-constraints --disable-datepick --disable-dctransform --disable-debugreport \
 	--disable-dialupman --disable-docview --disable-filehistory --disable-finddlg \
 	--disable-fs_archive --disable-fs_inet --disable-fs_zip --disable-fsvolume \
 	--disable-fswatcher --disable-gif --disable-help --disable-html --disable-ipc \
diff --git a/libaegisub/common/character_count.cpp b/libaegisub/common/character_count.cpp
index 0b8c70b31..1276f74fb 100644
--- a/libaegisub/common/character_count.cpp
+++ b/libaegisub/common/character_count.cpp
@@ -36,7 +36,7 @@ icu::BreakIterator& get_break_iterator(const char *ptr, size_t len) {
 	static std::once_flag token;
 	std::call_once(token, [&] {
 		UErrorCode status = U_ZERO_ERROR;
-		bi.reset(BreakIterator::createCharacterInstance(Locale::getDefault(), status));
+		bi.reset(icu::BreakIterator::createCharacterInstance(icu::Locale::getDefault(), status));
 		if (U_FAILURE(status)) throw agi::InternalError("Failed to create character iterator");
 	});
 
@@ -58,7 +58,7 @@ size_t count_in_range(Iterator begin, Iterator end, int mask) {
 
 	size_t count = 0;
 	auto pos = character_bi.first();
-	for (auto end = character_bi.next(); end != BreakIterator::DONE; pos = end, end = character_bi.next()) {
+	for (auto end = character_bi.next(); end != icu::BreakIterator::DONE; pos = end, end = character_bi.next()) {
 		if (!mask)
 			++count;
 		else {
@@ -143,7 +143,7 @@ size_t IndexOfCharacter(std::string const& str, size_t n) {
 	auto& bi = get_break_iterator(&str[0], str.size());
 
 	for (auto pos = bi.first(), end = bi.next(); ; --n, pos = end, end = bi.next()) {
-		if (end == BreakIterator::DONE)
+		if (end == icu::BreakIterator::DONE)
 			return str.size();
 		if (n == 0)
 			return pos;
diff --git a/src/utils.cpp b/src/utils.cpp
index 876c4c011..2416aa7a2 100644
--- a/src/utils.cpp
+++ b/src/utils.cpp
@@ -270,9 +270,9 @@ agi::fs::path SaveFileSelector(wxString const& message, std::string const& optio
 }
 
 wxString LocalizedLanguageName(wxString const& lang) {
-	Locale iculoc(lang.c_str());
+	icu::Locale iculoc(lang.c_str());
 	if (!iculoc.isBogus()) {
-		UnicodeString ustr;
+		icu::UnicodeString ustr;
 		iculoc.getDisplayName(iculoc, ustr);
 #ifdef _MSC_VER
 		return wxString(ustr.getBuffer());