diff -ruN ExtUtils-MakeMaker-snap/lib/ExtUtils/MakeMaker.pm ExtUtils-MakeMaker-snap-mhx/lib/ExtUtils/MakeMaker.pm
--- ExtUtils-MakeMaker-snap/lib/ExtUtils/MakeMaker.pm	2003-11-14 02:31:29.000000000 +0100
+++ ExtUtils-MakeMaker-snap-mhx/lib/ExtUtils/MakeMaker.pm	2003-12-14 00:40:18.000000000 +0100
@@ -221,7 +221,7 @@
     PERL_LIB        PERL_ARCHLIB 
     SITELIBEXP      SITEARCHEXP 
 
-    INC INCLUDE_EXT LDFROM LIB LIBPERL_A LIBS
+    INC INCLUDE_EXT LDFROM LIB LIBPERL_A LIBS LICENSE
     LINKTYPE MAKEAPERL MAKEFILE MAKEFILE_OLD MAN1PODS MAN3PODS MAP_TARGET 
     MYEXTLIB NAME NEEDS_LINKING NOECHO NO_META NORECURS NO_VC OBJECT OPTIMIZE 
     PERL_MALLOC_OK PERL PERLMAINCC PERLRUN PERLRUNINST PERL_CORE
@@ -422,6 +422,14 @@
         }
     }
 
+    # Check for a valid license
+    my %licenses = map {$_, 1} qw(perl gpl artistic lgpl bsd open_source
+                                  unrestricted restrictive unknown);
+    $self->{LICENSE} ||= 'unknown';
+    unless (exists $licenses{$self->{LICENSE}}) {
+        Carp::carp("WARNING: Unknown license type '$self->{LICENSE}'\n");
+    }
+
     # This is for old Makefiles written pre 5.00, will go away
     if ( Carp::longmess("") =~ /runsubdirpl/s ){
         Carp::carp("WARNING: Please rerun 'perl Makefile.PL' to regenerate your Makefiles\n");
@@ -1675,6 +1683,23 @@
 
 MakeMaker will turn it into an array with one element.
 
+=item LICENSE
+
+The license under which the module is distributed.
+This can be one of the following:
+
+  perl
+  gpl
+  artistic
+  lgpl
+  bsd
+  open_source
+  unrestricted
+  restrictive
+  unknown
+
+The default will be 'unknown'.
+
 =item LINKTYPE
 
 'static' or 'dynamic' (default unless usedl=undef in
diff -ruN ExtUtils-MakeMaker-snap/lib/ExtUtils/MM_Any.pm ExtUtils-MakeMaker-snap-mhx/lib/ExtUtils/MM_Any.pm
--- ExtUtils-MakeMaker-snap/lib/ExtUtils/MM_Any.pm	2003-11-14 02:30:33.000000000 +0100
+++ ExtUtils-MakeMaker-snap-mhx/lib/ExtUtils/MM_Any.pm	2003-12-14 00:49:20.000000000 +0100
@@ -610,20 +610,27 @@
     my $prereq_pm = '';
     foreach my $mod ( sort { lc $a cmp lc $b } keys %{$self->{PREREQ_PM}} ) {
         my $ver = $self->{PREREQ_PM}{$mod};
-        $prereq_pm .= sprintf "    %-30s %s\n", "$mod:", $ver;
+        $prereq_pm .= sprintf "  %-30s %s\n", "$mod:", $ver;
     }
 
     my $meta = <<YAML;
+--- #YAML:1.0
 # http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
-name:         $self->{DISTNAME}
-version:      $self->{VERSION}
-version_from: $self->{VERSION_FROM}
-installdirs:  $self->{INSTALLDIRS}
-requires:
-$prereq_pm
+name:              $self->{DISTNAME}
+version:           $self->{VERSION}
+version_from:      $self->{VERSION_FROM}
+installdirs:       $self->{INSTALLDIRS}
+license:           $self->{LICENSE}
 distribution_type: module
-generated_by: ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION
+YAML
+
+    $meta .= $prereq_pm ? "requires:\n$prereq_pm" : <<YAML;
+requires:          {}
+YAML
+
+    $meta .= <<YAML;
+generated_by:      ExtUtils::MakeMaker version $ExtUtils::MakeMaker::VERSION
 YAML
 
     my @write_meta = $self->echo($meta, 'META_new.yml');
diff -ruN ExtUtils-MakeMaker-snap/Makefile.PL ExtUtils-MakeMaker-snap-mhx/Makefile.PL
--- ExtUtils-MakeMaker-snap/Makefile.PL	2003-04-07 04:11:24.000000000 +0200
+++ ExtUtils-MakeMaker-snap-mhx/Makefile.PL	2003-12-14 00:47:37.000000000 +0100
@@ -66,6 +66,7 @@
 
     ABSTRACT_FROM   => "lib/$PACKAGE_FILE.pm",
     AUTHOR          => 'Michael G Schwern <schwern@pobox.com>',
+    LICENSE         => 'perl',
 );
 
 if( !$Is_VMS && $MM->{PERL} =~ /\S\s+\S/ ) {
