diff --git a/plug-ins/perl/Changes b/plug-ins/perl/Changes
index 65aaebc2fa..62f307acac 100644
--- a/plug-ins/perl/Changes
+++ b/plug-ins/perl/Changes
@@ -22,6 +22,8 @@ Revision history for Gimp-Perl extension.
         - re-apply patches to examples/xachshadow, xachlego after I nuked
           them without knowing.
         - updated examples/xachvision.
+        - make configuration more paranoid (break with standalone build rather
+          than inside the gimp)
 
 1.201 Thu Aug 24 23:44:43 CEST 2000
 	** LAST VERSION THAT WORKS WITH 1.0 **
diff --git a/plug-ins/perl/Makefile.PL b/plug-ins/perl/Makefile.PL
index 0d6e1fd064..f559637581 100644
--- a/plug-ins/perl/Makefile.PL
+++ b/plug-ins/perl/Makefile.PL
@@ -10,15 +10,17 @@ if ($ARGV[0] ne "--writemakefile") {
    }
    
    do './config.pl';
-   $EXTENSIVE_TESTS = 1;
-   
-   $ENV{'EXTENSIVE_TESTS'} = $EXTENSIVE_TESTS;
-   $ENV{CC}=$Config{cc};
-   $ENV{LD}=$Config{ld};
-   $ENV{prefix}=$Config{prefix};
-   $ENV{PERL}=$Config{perlpath};
-   $ENV{MAKEFILE_PL}=$0;
-   $ENV{IN_GIMP}=0;
+   unless ($ENV{IN_GIMP}) { # for the release, take the medium conservative approach
+      $EXTENSIVE_TESTS = 1;
+      
+      $ENV{'EXTENSIVE_TESTS'} = $EXTENSIVE_TESTS;
+      $ENV{CC}=$Config{cc};
+      $ENV{LD}=$Config{ld};
+      $ENV{prefix}=$Config{prefix};
+      $ENV{PERL}=$Config{perlpath};
+      $ENV{MAKEFILE_PL}=$0;
+      $ENV{IN_GIMP}=0;
+   }
    exit system("./configure",@ARGV)>>8;
 } else {
    shift;
@@ -32,7 +34,7 @@ if ($ARGV[0] ne "--writemakefile") {
 @gtk_pins =
    qw(
      dataurl colorhtml avi PDB parasite-editor fade-alpha
-   ); # miff should be in @pins(!) but detection of non-default arguments is broken
+   );
 @pins =
    qw(
       windify prep4gif webify tex-to-float ditherize
@@ -350,7 +352,7 @@ EOF
 __END__
 # write an empty makefile (the last chance to stop)
 # and warn the user.
-sub not_halt {
+sub emergency_stop {
    print STDERR "WARNING: *** perl extension will not be built ($_[0]) ***\n\n";
    open MAKEFILE,">Makefile" or die "unable to create Makefile: $!";
    print MAKEFILE <<EOF;
diff --git a/plug-ins/perl/config.pl.in b/plug-ins/perl/config.pl.in
index e9cde87305..7bd2519a42 100644
--- a/plug-ins/perl/config.pl.in
+++ b/plug-ins/perl/config.pl.in
@@ -150,10 +150,20 @@ for(keys %cfg) {
 }
 
 sub MY::makefile {
-   package MY;
-   my $t = shift->SUPER::makefile(@_);
-   $t =~ s/^	false$/	true/m;
-   $t;
+   my $self = shift;
+   if ($IN_GIMP) {
+      return q{
+}.$self->{MAKEFILE}.q{ : Makefile.PL $(CONFIGDEP)
+	}.$self->{NOECHO}.q{echo "rebuilding Makefile (is out-of-date with respect to $?)"
+	-}.$self->{NOECHO}.q{$(RM_F) }."$self->{MAKEFILE}.old".q{
+	-}.$self->{NOECHO}.q{$(MV) }."$self->{MAKEFILE} $self->{MAKEFILE}.old".q{
+	-$(MAKE) -f }.$self->{MAKEFILE}.q{.old clean $(DEV_NULL) || $(NOOP)
+	$(PERL) "-I$(PERL_ARCHLIB)" "-I$(PERL_LIB)" Makefile.PL --writemakefile }.join(" ",map(qq["$_"],@ARGV)).q{
+
+};
+   } else {
+      return $self->MM::makefile(@_);
+   }
 }
 
 
diff --git a/plug-ins/perl/examples/blended2 b/plug-ins/perl/examples/blended2
index f6520a6f78..d7b22e7c8e 100755
--- a/plug-ins/perl/examples/blended2
+++ b/plug-ins/perl/examples/blended2
@@ -77,7 +77,7 @@ register "make_bevel_logos",
          "(c) 2000 M. Gherlone",
          "20000130",
          N_"<Image>/Filters/Logulator/Blended II...",
-         "RGBA, GRAYA",
+         "*",
          [
            [PF_COLOUR	, 'choose_bg_colour', "Choose the background colour", [255, 255, 255]],
            [PF_COLOUR	, 'blend_start',  "Choose the 1st blend colour", [247, 231, 9]],
diff --git a/plug-ins/perl/examples/translogo b/plug-ins/perl/examples/translogo
index a6013a7d41..a35e8ab406 100755
--- a/plug-ins/perl/examples/translogo
+++ b/plug-ins/perl/examples/translogo
@@ -83,7 +83,7 @@ register "make_trans_logos",
          "(c) 2000 M. Gherlone",
          "20000123",
          N_"<Image>/Filters/Logulator/Transparent Logo...",
-         "RGBA, GRAYA",
+         "*",
          [
            [PF_RADIO	, 'use_a_colour_or_a_pattern_for_text', "The user's choice", 0, [Colour => 0, Pattern => 1]],
            [PF_PATTERN	, 'choose_a_pattern', "Choose the text Pattern", "Wood #1"],
diff --git a/plug-ins/perl/po/ChangeLog b/plug-ins/perl/po/ChangeLog
index 8152f82f51..2b15213c72 100644
--- a/plug-ins/perl/po/ChangeLog
+++ b/plug-ins/perl/po/ChangeLog
@@ -1,15 +1,3 @@
-2000-12-09  Zbigniew Chyla  <cyba@gnome.pl>
-
-	* pl.po: Updated Polish translation
-
-2000-12-03  Shirasaki Yasuhiro  <yasuhiro@gnome.gr.jp>
-
-	* ja.po: updated translation.
-
-2000-11-25  Shirasaki Yasuhiro  <yasuhiro@gnome.gr.jp>
-
-	* ja.po: updated translation.
-
 2000-10-29  Artur Polaczynski <artie@kmfms.com>
 
 	* pl.po: updated translation.