diff --git a/Build.PL b/Build.PL
index 301df9f33..d5f7344cf 100644
--- a/Build.PL
+++ b/Build.PL
@@ -29,6 +29,8 @@ my %prereqs = qw(
 my %recommends = qw(
     Class::XSAccessor               0
     Test::Harness                   0
+    Thread::Queue                   0
+    threads::shared                 0
 );
 
 my $sudo    = grep { $_ eq '--sudo' } @ARGV;
diff --git a/xs/Build.PL b/xs/Build.PL
index 12837630e..88790dc5c 100644
--- a/xs/Build.PL
+++ b/xs/Build.PL
@@ -24,7 +24,9 @@ if ($cpp_guess->is_gcc)	{
 }
 my @ldflags = ();
 if ($^O eq 'darwin') {
-    push @cflags, qw(-stdlib=libc++);
+    if (!$cpp_guess->is_gcc) {
+        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