Index: config/auto/icu.pm
--- config/auto/icu.pm.orig	2015-01-23 14:30:22.000000000 +0100
+++ config/auto/icu.pm	2015-04-05 11:43:28.870684318 +0200
@@ -363,7 +363,7 @@
         }
         # This will fails on multi-arch [GH #1014]
         # so we rely on the cc probe then. No need to use pkg-config
-        $icuheaders .= "/include";
+        $icuheaders .= "/include/icu";
         if (! -d $icuheaders) {
             $without = 1;
         }
Index: config/auto/warnings.pm
--- config/auto/warnings.pm.orig	2015-01-16 18:12:51.000000000 +0100
+++ config/auto/warnings.pm	2015-04-05 11:43:28.870684318 +0200
@@ -151,7 +151,6 @@
         -Wstrict-aliasing=2
         -Wswitch
         -Wswitch-default
-        -Werror=undef
         -Wno-unused
         -Wvariadic-macros
         -Wwrite-strings
Index: config/init/install.pm
--- config/init/install.pm.orig	2011-03-01 15:15:56.000000000 +0100
+++ config/init/install.pm	2015-04-05 11:43:28.870684318 +0200
@@ -84,7 +84,7 @@
     my $mandir = assign_dir( $conf, 'mandir', $prefix, '/man' );
 
     #  --srcdir=DIR           source code files PREFIX/src]
-    my $srcdir = assign_dir( $conf, 'srcdir', $prefix, '/src' );
+    my $srcdir = assign_dir( $conf, 'srcdir', $prefix, '/share/parrot/src' );
 
     $conf->data->set(
         prefix         => $prefix,
Index: src/string/api.c
--- src/string/api.c.orig	2015-01-16 18:12:51.000000000 +0100
+++ src/string/api.c	2015-04-05 11:50:39.781219735 +0200
@@ -2147,7 +2147,7 @@
             return PARROT_FLOATVAL_INF_NEGATIVE;
     }
 
-#if defined(PARROT_HAS_POWL) && !defined(__CYGWIN__)
+#if defined(PARROT_HAS_POWL) && !defined(__CYGWIN__) && !defined(__FreeBSD__)
 #  define POW powl
 #else
 #  define POW pow
