Index: config/gen/makefiles/dynclasses_pl.in
===================================================================
--- config/gen/makefiles/dynclasses_pl.in	(revision 10901)
+++ config/gen/makefiles/dynclasses_pl.in	(working copy)
@@ -18,19 +18,17 @@
 use File::Copy qw(copy);
 
 # qq[] isn't guaranteed to work, but it's safer than "" as some platforms
-# (eg FreeBSD) have ""s embedded in their substution values. q[] is used in
+# (eg FreeBSD) have ""s embedded in their substitution values. q[] is used in
 # some places as Win32 paths have \'s in, which qq[] treats as escape sequences.
 # Config stuff
+our $PERL = q[${perl}];
 our $CC = qq[${cc} -c];
 our $LD = qq[${ld}];
 our $LDFLAGS = qq[${ldflags} ${ld_debug}];
 our $LD_LOAD_FLAGS = qq[${ld_load_flags}];
-our $PERL = q[${perl}];
 our $LOAD_EXT = qq[${load_ext}];
 our $O = qq[${o}];
-our $LIBPARROT = qq[${build_dir}/src/extend${o}];
-    # XXX: ultimately, this should be replaced with:
-    #  $LIBPARROT = qq[-L../blib/lib -lparrot];
+our $LIBPARROT = qq[-L${build_dir}${slash}${blib_dir} -lparrot];
 our $CFLAGS = qq[${ccflags} ${cc_shared} ${cc_debug} ${ccwarn} ${cc_hasjit} ${cg_flag} ${gc_flag} ${cc_building_dynclass_flag}];
 
 # Here comes some stuff for Win32.
Index: config/init/hints/cygwin.pm
===================================================================
--- config/init/hints/cygwin.pm	(revision 10901)
+++ config/init/hints/cygwin.pm	(working copy)
@@ -21,10 +21,11 @@
     # If this later causes problems, it might be worth revisiting.
     # A. Dougherty 9/9/2002
     $conf->data->set(
-        ld             => 'gcc',
-        ld_share_flags => '-shared',
-        ld_load_flags  => '-shared',
-        libs           => $libs,
+        ld                  => 'gcc',
+        ld_share_flags      => '-shared',
+        ld_load_flags       => '-shared',
+        libs                => $libs,
+        libparrot_is_shared => 1
     );
 
     # We need to define inet_aton on Cygwin.  The contents of the --define