diff --git a/package/osx/make_dmg.sh b/package/osx/make_dmg.sh
index 85e9fd33e..cbacbac23 100755
--- a/package/osx/make_dmg.sh
+++ b/package/osx/make_dmg.sh
@@ -72,6 +72,8 @@ cp $SLIC3R_DIR/slic3r.pl $macosfolder/slic3r.pl
 cp -RP $SLIC3R_DIR/local-lib $macosfolder/local-lib
 cp -RP $SLIC3R_DIR/lib/* $macosfolder/local-lib/lib/perl5/
 find $macosfolder/local-lib -name man -type d -delete
+find $macosfolder/local-lib -name .packlist -delete
+rm -rf $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets/osx_cocoa_3_0_2_uni/include
 
 echo "Relocating dylib paths..."
 for bundle in $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/auto/Wx/Wx.bundle $(find $macosfolder/local-lib/lib/perl5/darwin-thread-multi-2level/Alien/wxWidgets -name '*.dylib' -type f); do
diff --git a/xs/Build.PL b/xs/Build.PL
index 88790dc5c..12837630e 100644
--- a/xs/Build.PL
+++ b/xs/Build.PL
@@ -24,9 +24,7 @@ if ($cpp_guess->is_gcc)	{
 }
 my @ldflags = ();
 if ($^O eq 'darwin') {
-    if (!$cpp_guess->is_gcc) {
-        push @cflags, qw(-stdlib=libc++);
-    }
+    push @cflags, qw(-stdlib=libc++);
     push @ldflags, qw(-framework IOKit -framework CoreFoundation -lc++);
     
     # Due to a bug/misconfiguration/stupidity, boost 1.52 and libc++ don't like each
diff --git a/xs/MANIFEST b/xs/MANIFEST
index 052a0f808..3b89458d3 100644
--- a/xs/MANIFEST
+++ b/xs/MANIFEST
@@ -161,7 +161,6 @@ t/19_model.t
 t/20_print.t
 t/21_gcode.t
 t/22_exception.t
-t/23_config.t
 t/inc/22_config_bad_config_options.ini
 xsp/BoundingBox.xsp
 xsp/BridgeDetector.xsp