diff --git a/setup/build_environment.py b/setup/build_environment.py
index ade6733021..3f5c34fe7b 100644
--- a/setup/build_environment.py
+++ b/setup/build_environment.py
@@ -156,19 +156,20 @@ if iswindows:
     podofo_inc = os.path.join(sw_inc_dir, 'podofo')
     podofo_lib = sw_lib_dir
 elif isosx:
-    podofo_inc = '/sw/podofo'
-    podofo_lib = '/sw/lib'
-    magick_inc_dirs = consolidate('MAGICK_INC',
-        '/sw/include/ImageMagick')
-    magick_lib_dirs = consolidate('MAGICK_LIB',
-        '/sw/lib')
+    sw = os.environ.get('SW', '/sw')
+    podofo_inc = os.path.join(sw, 'podofo')
+    podofo_lib = os.path.join(sw, 'lib')
+    magick_inc_dirs = consolidate('MAGICK_INC', sw + '/include/ImageMagick')
+    magick_lib_dirs = consolidate('MAGICK_LIB', sw + '/lib')
     magick_libs = ['MagickWand', 'MagickCore']
-    png_inc_dirs = consolidate('PNG_INC_DIR', '/sw/include')
-    png_lib_dirs = consolidate('PNG_LIB_DIR', '/sw/lib')
+    png_inc_dirs = consolidate('PNG_INC_DIR', sw + '/include')
+    png_lib_dirs = consolidate('PNG_LIB_DIR', sw + '/lib')
     png_libs = ['png12']
     ft_libs = ['freetype']
-    ft_inc_dirs = ['/sw/include/freetype2']
-    bq = glob.glob('/sw/build/qt-*/include')[-1]
+    ft_inc_dirs = [sw + '/include/freetype2']
+    bq = glob.glob(sw + '/build/qt-*/include')[-1]
+    icu_inc_dirs = [sw + '/include']
+    icu_lib_dirs = [sw + '/lib']
 else:
     # Include directories
     png_inc_dirs = pkgconfig_include_dirs('libpng', 'PNG_INC_DIR',
diff --git a/setup/extensions.py b/setup/extensions.py
index 3a42cba9f6..230bcb73a7 100644
--- a/setup/extensions.py
+++ b/setup/extensions.py
@@ -65,9 +65,6 @@ icu_libs = ['icudata', 'icui18n', 'icuuc', 'icuio']
 icu_cflags = []
 if iswindows:
     icu_libs = ['icudt', 'icuin', 'icuuc', 'icuio']
-if isosx:
-    icu_libs = ['icucore']
-    icu_cflags = ['-DU_DISABLE_RENAMING']  # Needed to use system libicucore.dylib
 
 extensions = [
 
diff --git a/setup/installer/osx/app/main.py b/setup/installer/osx/app/main.py
index ecc754f784..c4a332e2af 100644
--- a/setup/installer/osx/app/main.py
+++ b/setup/installer/osx/app/main.py
@@ -437,7 +437,7 @@ class Py2App(object):
     @flush
     def add_misc_libraries(self):
         for x in ('usb-1.0.0', 'mtp.9', 'readline.6.1', 'wmflite-0.2.7',
-                  'chm.0', 'sqlite3.0'):
+                  'chm.0', 'sqlite3.0', 'icudata.53', 'icui18n.53', 'icuio.53', 'icuuc.53'):
             info('\nAdding', x)
             x = 'lib%s.dylib'%x
             shutil.copy2(join(SW, 'lib', x), self.frameworks_dir)