diff --git a/bin/g-cpan b/bin/g-cpan
index b392a4b..fd213de 100644
--- a/bin/g-cpan
+++ b/bin/g-cpan
@@ -553,6 +553,7 @@ sub generatePackageInfo
         spinner_start();
         $gcpan_run->{cpan}{lc($ebuild_wanted)}{portage_name}    = $gcpan_run->transformCPAN($gcpan_run->{cpan}{lc($ebuild_wanted)}{src_uri}, 'n');
         $gcpan_run->{cpan}{lc($ebuild_wanted)}{portage_version} = $gcpan_run->transformCPAN($gcpan_run->{cpan}{lc($ebuild_wanted)}{src_uri}, 'v');
+        $gcpan_run->{cpan}{lc($ebuild_wanted)}{module_version} = $gcpan_run->transformCPAN($gcpan_run->{cpan}{lc($ebuild_wanted)}{src_uri}, 'mv');
         spinner_stop();
     }
     else
@@ -686,7 +687,7 @@ sub generatePackageInfo
                             }
                         }
 
-                        my $module_version = $gcpan_run->{cpan}{ lc($original_ebuild) }{portage_version};
+                        my $module_version = $gcpan_run->{cpan}{ lc($original_ebuild) }{module_version};
                         my $description = $gcpan_run->{'cpan'}{ lc($original_ebuild) }{'description'};
                         $description =~ s/"/\\"/g;
 
diff --git a/lib/Gentoo/CPAN.pm b/lib/Gentoo/CPAN.pm
index 2f6e570..a14e171 100644
--- a/lib/Gentoo/CPAN.pm
+++ b/lib/Gentoo/CPAN.pm
@@ -462,7 +462,7 @@ sub transformCPAN {
     $filenamever =~ s/([0-9.]+)-([0-9.]+)$/$1\.$2/;
 
     # Remove leading v's - happens on occasion
-    $filenamever =~ s{^v}{}i;
+    $filenamever =~ s{^v}{}i if $req ne 'mv';
 
     # Some modules don't use the /\d\.\d\d/ convention, and portage goes
     # berserk if the ebuild is called ebulldname-.02.ebuild -- so we treat
@@ -471,7 +471,7 @@ sub transformCPAN {
         $filenamever = 0 . $filenamever;
     }
 
-    return ( $req eq 'v' ) ? $filenamever : $filename;
+    return ( $req eq 'v' || $req eq 'mv' ) ? $filenamever : $filename;
 }
 
 sub makeCPANstub {