Index: compilers/imcc/imcc.l
--- compilers/imcc/imcc.l.orig	2009-07-14 21:41:37 +0200
+++ compilers/imcc/imcc.l	2009-07-24 17:05:56 +0200
@@ -114,6 +114,7 @@
 %option reentrant
 %option never-interactive
 %option stack
+%option array
 
 LETTER          [a-zA-Z_@]
 DIGIT           [0-9]
Index: config/auto/icu.pm
--- config/auto/icu.pm.orig	2009-06-27 21:41:40 +0200
+++ config/auto/icu.pm	2009-07-24 17:05:56 +0200
@@ -333,7 +333,7 @@
             $without = 1;
         }
         my $slash = $conf->data->get('slash');
-        $icuheaders .= "${slash}include";
+        $icuheaders .= "${slash}include/icu";
         if (! -d $icuheaders) {
             $without = 1;
         }
Index: config/auto/readline.pm
--- config/auto/readline.pm.orig	2009-04-28 11:55:39 +0200
+++ config/auto/readline.pm	2009-07-24 17:05:56 +0200
@@ -36,7 +36,8 @@
 sub runstep {
     my ( $self, $conf ) = @_;
 
-    my $verbose = $conf->options->get('verbose');
+    my ($verbose, $without) = $conf->options->get('verbose', 'without-readline');
+    return 1 if ($without);
 
     my $cc     = $conf->data->get('cc');
     my $osname = $conf->data->get_p5('OSNAME');
Index: config/init/hints/freebsd.pm
--- config/init/hints/freebsd.pm.orig	2009-07-07 07:13:00 +0200
+++ config/init/hints/freebsd.pm	2009-07-24 17:09:26 +0200
@@ -36,7 +36,7 @@
         rpath => '-Wl,-R',
 
         has_dynamic_linking    => 1,
-        parrot_is_shared       => 1,
+        parrot_is_shared       => 0,
         libparrot_shared       => "libparrot$share_ext.$version",
         libparrot_shared_alias => "libparrot$share_ext",
         libparrot_soname       => "-Wl,-soname=libparrot$share_ext.$version",
Index: config/init/hints/linux.pm
--- config/init/hints/linux.pm.orig	2009-07-07 07:13:00 +0200
+++ config/init/hints/linux.pm	2009-07-24 17:09:42 +0200
@@ -143,7 +143,7 @@
         rpath          => '-Wl,-rpath=',
 
         has_dynamic_linking    => 1,
-        parrot_is_shared       => 1,
+        parrot_is_shared       => 0,
         libparrot_shared       => "libparrot$share_ext.$version",
         libparrot_shared_alias => "libparrot$share_ext",
         libparrot_soname       => "-Wl,-soname=libparrot$share_ext.$version",
Index: lib/Parrot/Configure/Options/Conf.pm
--- lib/Parrot/Configure/Options/Conf.pm.orig	2009-07-14 21:41:35 +0200
+++ lib/Parrot/Configure/Options/Conf.pm	2009-07-24 17:05:56 +0200
@@ -105,6 +105,7 @@
    --without-gettext    Build parrot without gettext support
    --without-gmp        Build parrot without GMP support
    --without-opengl     Build parrot without OpenGL support (GL/GLU/GLUT)
+   --without-readline   Build parrot without Readline support
    --without-pcre       Build parrot without pcre support
 
 ICU Options:
Index: lib/Parrot/Configure/Options/Conf/Shared.pm
--- lib/Parrot/Configure/Options/Conf/Shared.pm.orig	2009-07-14 21:41:35 +0200
+++ lib/Parrot/Configure/Options/Conf/Shared.pm	2009-07-24 17:05:56 +0200
@@ -74,6 +74,7 @@
     without-gmp
     without-icu
     without-opengl
+    without-readline
     without-pcre
     without-threads
     yacc