diff --git a/extlib/HTTP/MobileAttribute.pm b/extlib/HTTP/MobileAttribute.pm
index 0a1b9ef2..a82c1024 100644
--- a/extlib/HTTP/MobileAttribute.pm
+++ b/extlib/HTTP/MobileAttribute.pm
@@ -1,7 +1,7 @@
 package HTTP::MobileAttribute;
 use strict;
 use warnings;
-our $VERSION = '0.11';
+our $VERSION = '0.13';
 use HTTP::MobileAttribute::Request;
 use HTTP::MobileAttribute::CarrierDetector;
 use UNIVERSAL::require;
@@ -76,6 +76,9 @@ HTTP::MobileAttribute - Yet Another HTTP::MobileAgent
   $agent->is_supported_flash();
   $agent->is_supported_gif();
 
+  # in apache2
+  my $agent = HTTP::MobileAttribute->new($r->headers_in);
+
 =head1 WARNINGS
 
 WE ARE NOW TESTING THE CONCEPT.
diff --git a/extlib/HTTP/MobileAttribute/CarrierDetector.pm b/extlib/HTTP/MobileAttribute/CarrierDetector.pm
index 8dbcd05d..d96d36f5 100644
--- a/extlib/HTTP/MobileAttribute/CarrierDetector.pm
+++ b/extlib/HTTP/MobileAttribute/CarrierDetector.pm
@@ -16,7 +16,9 @@ our $AirHRE = '^Mozilla\/3\.0\((?:WILLCOM|DDIPOCKET)\;';
 sub detect {
     my $user_agent = shift;
 
-    if ( $user_agent =~ /$DoCoMoRE/ ) {
+    if (not defined $user_agent) {
+        return 'NonMobile';
+    } elsif ( $user_agent =~ /$DoCoMoRE/ ) {
         return 'DoCoMo';
     } elsif ( $user_agent =~ /$JPhoneRE|$VodafoneRE|$VodafoneMotRE|$SoftBankRE|$SoftBankCrawlerRE/) {
         return 'ThirdForce';
@@ -24,8 +26,9 @@ sub detect {
         return 'EZweb';
     } elsif ( $user_agent =~ /$AirHRE/ ) {
         return 'AirHPhone';
+    } else {
+        return 'NonMobile';
     }
-    return 'NonMobile';
 }
 
         
diff --git a/extlib/HTTP/MobileAttribute/Plugin/CIDR.pm b/extlib/HTTP/MobileAttribute/Plugin/CIDR.pm
index eb152c36..269e2510 100644
--- a/extlib/HTTP/MobileAttribute/Plugin/CIDR.pm
+++ b/extlib/HTTP/MobileAttribute/Plugin/CIDR.pm
@@ -57,7 +57,7 @@ HTTP::MobileAttribute::Plugin::CIDR - キャリヤのCIDRの含まれるIPアド
 
 'isa_cidr'メソッドに調べたいIPアドレスを引数として呼ぶと、L<Net::CIDR::MobileJP>を使って、キャリヤの CIDR に含まれるIPアドレスかが分かります。
 
-各キャリヤの CIDR 情報はマシンリーダブルな形式では提供されていないのでL<Net::CIDR::MobileJP>に付属するnet-cidr-mobilejp-scraper.plを用いて各キャリアの CIDR 情報をまとめたYAMLファイルを作る必要があります。
+各キャリヤの CIDR 情報はマシンリーダブルな形式では提供されていないのでL<Net::CIDR::MobileJP>に付属するnet-cidr-mobilejp-scraper.plを用いて各キャリアの CIDR 情報をまとめた YAML ファイルを作る必要があります。
 
 =head1 TODO
 
diff --git a/extlib/HTTP/MobileAttribute/Plugin/UserID.pm b/extlib/HTTP/MobileAttribute/Plugin/UserID.pm
index 4eaebd4a..8903c123 100644
--- a/extlib/HTTP/MobileAttribute/Plugin/UserID.pm
+++ b/extlib/HTTP/MobileAttribute/Plugin/UserID.pm
@@ -39,7 +39,7 @@ sub docomo_guid :CarrierMethod('DoCoMo', 'guid') {
     $c->request->get('x-dcmguid');
 }
 
-sub supportes_user_id :Method {
+sub supports_user_id :Method {
     my ($self, $c) = @_;
 
     return ( $c->is_ezweb || ($c->is_thirdforce && !$c->is_type_c) || $c->is_docomo )  ? 1 : 0;
@@ -48,15 +48,15 @@ sub supportes_user_id :Method {
 1;
 __END__
 
-$r->param('uid') L<Apache::DoCoMoUID>
-
 =for stopwords FOMA guid fallback
 
+=for stopwords DoCoMo
+
 =encoding UTF-8
 
-=for stopwords DoCoMo
+=head1 NAME
 
-=head1 NAME HTTP::MobileAttribute::Plugin::UserID - ユーザIDや端末IDを返す
+HTTP::MobileAttribute::Plugin::UserID - ユーザ ID や端末 ID を返す
 
 =head1 DESCRIPTION
 
@@ -64,7 +64,7 @@ $r->param('uid') L<Apache::DoCoMoUID>
     my $hma = HTTP::MobileAttribute->new($ua);
     $hma->id;
 
-ユーザIDが送信されていなければ端末IDを返す
+ユーザ ID が送信されていなければ端末 ID を返す
 
     use HTTP::MobileAttribute plugins => [
         'Core',
@@ -76,7 +76,7 @@ $r->param('uid') L<Apache::DoCoMoUID>
     my $hma = HTTP::MobileAttribute->new($ua);
     $hma->id;
 
-FOMA の場合にはカードIDも付与する
+FOMA の場合にはカード ID も付与する
 
     use HTTP::MobileAttribute plugins => [
         'Core',
@@ -103,16 +103,16 @@ guidのみを直接取得する(DoCoMoのみ)
 
 =head1 DESCRIPTION
 
-'id'メソッド呼ぶと、キャリヤより送信されてくるユーザIDを取得できます。
+'id'メソッド呼ぶと、キャリヤより送信されてくるユーザ ID を取得できます。
 
-ユーザの設定によりキャリアからユーザIDが送られてこないときには undef が変えされますが、 load_plugin 時に fallback => 1 と config を追加すると、ユーザIDが取れないときには端末IDを取得するようになります。
-また、 FOMA の時には fallback_with_cardid => 1 と設定すると '端末ID,カードID'という形式でIDが戻されます。
+ユーザの設定によりキャリアからユーザ ID が送られてこないときには undef が変えされますが、 load_plugin 時に fallback => 1 と config を追加すると、ユーザ ID が取れないときには端末 ID を取得するようになります。
+また、 FOMA の時には fallback_with_cardid => 1 と設定すると '端末 ID ,カード ID 'という形式で ID が戻されます。
 
-fallback オプションを利用すると、ユーザIDなのか端末IDなのかを気にしたい時に煩雑になりがちなので、 fallback オプションの利用は控えた方が良いでしょう。
+fallback オプションを利用すると、ユーザ ID なのか端末 ID なのかを気にしたい時に煩雑になりがちなので、 fallback オプションの利用は控えた方が良いでしょう。
 
 なおL<Apache::DoCoMoUID>などにより、 HTTP_X_DOCOMO_UID 環境変数が設定されている場合には uid の取得は HTTP_X_DOCOMO_UID を利用します。
 
-DoCoMo の場合のみ、IDを取得する優先順位は uid -> guid -> fallback の順になります。
+DoCoMo の場合のみ、ID を取得する優先順位は uid -> guid -> fallback の順になります。
 
 =head1 AUTHORS
 
diff --git a/extlib/HTTP/MobileAttribute/Request.pm b/extlib/HTTP/MobileAttribute/Request.pm
index c2129e7d..20fa10bf 100644
--- a/extlib/HTTP/MobileAttribute/Request.pm
+++ b/extlib/HTTP/MobileAttribute/Request.pm
@@ -5,7 +5,8 @@ use Carp;
 use Class::Inspector;
 use Scalar::Util qw/blessed/;
 use HTTP::MobileAttribute::Request::Env;
-use HTTP::MobileAttribute::Request::Apache;
+use HTTP::MobileAttribute::Request::Apache; # for apache1
+use HTTP::MobileAttribute::Request::APRTable; # for apache2
 use HTTP::MobileAttribute::Request::HTTPHeaders;
 
 sub new {
@@ -18,11 +19,12 @@ sub new {
         $impl_class = join("::", __PACKAGE__, "Env");
     } elsif (blessed($stuff)) {
         # or, if it's blessed, check if they are of appropriate types
-        foreach my $pkg qw(Apache HTTP::Headers) {
+        foreach my $pkg qw(Apache HTTP::Headers HTTP::Headers::Fast APR::Table) {
             if ($stuff->isa($pkg)) {
                 $impl_class = join("::", __PACKAGE__, $pkg);
-                 # XXX Hack. Will only work for HTTPHeaders
-                $impl_class =~ s/HTTP::Headers$/HTTPHeaders/;
+                 # XXX Hack. Will only work for HTTPHeaders & APRTable
+                $impl_class =~ s/HTTP::Headers(?:::Fast)?$/HTTPHeaders/;
+                $impl_class =~ s/APR::Table$/APRTable/;
                 last;
             }
         }
diff --git a/extlib/HTTP/MobileAttribute/Request/APRTable.pm b/extlib/HTTP/MobileAttribute/Request/APRTable.pm
new file mode 100644
index 00000000..8a631d1b
--- /dev/null
+++ b/extlib/HTTP/MobileAttribute/Request/APRTable.pm
@@ -0,0 +1,15 @@
+package HTTP::MobileAttribute::Request::APRTable;
+use strict;
+use warnings;
+
+sub new {
+    my ($class, $stuff) = @_;
+    return bless { r => $stuff }, $class; 
+}
+
+sub get {
+    my ($self, $header) = @_;
+    return $self->{r}->{$header};
+}
+
+1;
diff --git a/extlib/i486-linux-gnu-thread-multi/auto/Carp/Clan/.packlist b/extlib/i486-linux-gnu-thread-multi/auto/Carp/Clan/.packlist
index 65e23cb5..8674f96b 100644
--- a/extlib/i486-linux-gnu-thread-multi/auto/Carp/Clan/.packlist
+++ b/extlib/i486-linux-gnu-thread-multi/auto/Carp/Clan/.packlist
@@ -1,6 +1,6 @@
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Carp/Clan.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Carp/Clan.pod
-/tmp/xy1rECOSkm/outputdir/man/man3/Carp::Clan.3pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Carp/Clan.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Carp/Clan.pod
+/tmp/RR9supEmoQ/outputdir/man/man3/Carp::Clan.3pm
 /usr/local/man/man3/Carp::Clan.3pm
 /usr/local/share/perl/5.8.8/Carp/Clan.pm
 /usr/local/share/perl/5.8.8/Carp/Clan.pod
diff --git a/extlib/i486-linux-gnu-thread-multi/auto/Class/Accessor/.packlist b/extlib/i486-linux-gnu-thread-multi/auto/Class/Accessor/.packlist
index 22ff83c5..f83bd5bd 100644
--- a/extlib/i486-linux-gnu-thread-multi/auto/Class/Accessor/.packlist
+++ b/extlib/i486-linux-gnu-thread-multi/auto/Class/Accessor/.packlist
@@ -1,9 +1,9 @@
-/tmp/izAOVMRaiV/outputdir/lib/perl5/Class/Accessor.pm
-/tmp/izAOVMRaiV/outputdir/lib/perl5/Class/Accessor/Fast.pm
-/tmp/izAOVMRaiV/outputdir/lib/perl5/Class/Accessor/Faster.pm
-/tmp/izAOVMRaiV/outputdir/man/man3/Class::Accessor.3pm
-/tmp/izAOVMRaiV/outputdir/man/man3/Class::Accessor::Fast.3pm
-/tmp/izAOVMRaiV/outputdir/man/man3/Class::Accessor::Faster.3pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Accessor.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Accessor/Fast.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Accessor/Faster.pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Class::Accessor.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Class::Accessor::Fast.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Class::Accessor::Faster.3pm
 /usr/local/man/man3/Class::Accessor.3pm
 /usr/local/man/man3/Class::Accessor::Fast.3pm
 /usr/local/man/man3/Class::Accessor::Faster.3pm
diff --git a/extlib/i486-linux-gnu-thread-multi/auto/Class/Component/.packlist b/extlib/i486-linux-gnu-thread-multi/auto/Class/Component/.packlist
index 64b023e9..556f0101 100644
--- a/extlib/i486-linux-gnu-thread-multi/auto/Class/Component/.packlist
+++ b/extlib/i486-linux-gnu-thread-multi/auto/Class/Component/.packlist
@@ -1,24 +1,24 @@
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Attribute.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Attribute/Hook.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Attribute/Method.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/Autocall.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/Autocall/Autoload.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/Autocall/InjectMethod.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/Autocall/SingletonMethod.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/AutoloadPlugin.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/DisableDynamicPlugin.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/Moosenize.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/Plaggerize.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/Plaggerize/ConfigLoader.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/Plaggerize/Log.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/Plaggerize/PluginLoader.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Component/SingletonMethod.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/Class/Component/Plugin.pm
-/tmp/xy1rECOSkm/outputdir/man/man3/Class::Component.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/Class::Component::Component::Moosenize.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/Class::Component::Component::Plaggerize.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/Class::Component::Plugin.3pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Attribute.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Attribute/Hook.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Attribute/Method.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/Autocall.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/Autocall/Autoload.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/Autocall/InjectMethod.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/Autocall/SingletonMethod.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/AutoloadPlugin.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/DisableDynamicPlugin.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/Moosenize.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/Plaggerize.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/Plaggerize/ConfigLoader.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/Plaggerize/Log.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/Plaggerize/PluginLoader.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Component/SingletonMethod.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Component/Plugin.pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Class::Component.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Class::Component::Component::Moosenize.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Class::Component::Component::Plaggerize.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Class::Component::Plugin.3pm
 /usr/local/man/man3/Class::Component.3pm
 /usr/local/man/man3/Class::Component::Component::Moosenize.3pm
 /usr/local/man/man3/Class::Component::Component::Plaggerize.3pm
diff --git a/extlib/i486-linux-gnu-thread-multi/auto/Class/Data/Inheritable/.packlist b/extlib/i486-linux-gnu-thread-multi/auto/Class/Data/Inheritable/.packlist
index a45bd636..88eb369e 100644
--- a/extlib/i486-linux-gnu-thread-multi/auto/Class/Data/Inheritable/.packlist
+++ b/extlib/i486-linux-gnu-thread-multi/auto/Class/Data/Inheritable/.packlist
@@ -1,4 +1,4 @@
-/tmp/rRpv9rIW_g/outputdir/lib/perl5/Class/Data/Inheritable.pm
-/tmp/rRpv9rIW_g/outputdir/man/man3/Class::Data::Inheritable.3pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Data/Inheritable.pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Class::Data::Inheritable.3pm
 /usr/local/man/man3/Class::Data::Inheritable.3pm
 /usr/local/share/perl/5.8.8/Class/Data/Inheritable.pm
diff --git a/extlib/i486-linux-gnu-thread-multi/auto/Class/Inspector/.packlist b/extlib/i486-linux-gnu-thread-multi/auto/Class/Inspector/.packlist
index 4743c912..c8e36e8d 100644
--- a/extlib/i486-linux-gnu-thread-multi/auto/Class/Inspector/.packlist
+++ b/extlib/i486-linux-gnu-thread-multi/auto/Class/Inspector/.packlist
@@ -1,4 +1,4 @@
-/tmp/_Cu7Sb_OZA/outputdir/lib/perl5/Class/Inspector.pm
-/tmp/_Cu7Sb_OZA/outputdir/man/man3/Class::Inspector.3pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Class/Inspector.pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Class::Inspector.3pm
 /usr/local/man/man3/Class::Inspector.3pm
 /usr/local/share/perl/5.8.8/Class/Inspector.pm
diff --git a/extlib/i486-linux-gnu-thread-multi/auto/HTTP/MobileAttribute/.packlist b/extlib/i486-linux-gnu-thread-multi/auto/HTTP/MobileAttribute/.packlist
index 980cbac0..11f357cb 100644
--- a/extlib/i486-linux-gnu-thread-multi/auto/HTTP/MobileAttribute/.packlist
+++ b/extlib/i486-linux-gnu-thread-multi/auto/HTTP/MobileAttribute/.packlist
@@ -1,43 +1,44 @@
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/AirHPhone.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/Base.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/DoCoMo.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/EZweb.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/NonMobile.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/ThirdForce.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Attribute/CarrierMethod.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/CarrierDetector.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/CIDR.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/CarrierLetter.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/Core.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/Display.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/Encoding.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/GPS.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/IS.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/IS/DoCoMo.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/IS/EZweb.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/IS/ThirdForce.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/UserID.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/XHTMLCompliant.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Request.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Request/Apache.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Request/Env.pm
-/tmp/xy1rECOSkm/outputdir/lib/perl5/HTTP/MobileAttribute/Request/HTTPHeaders.pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Agent::Base.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Attribute::CarrierMethod.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::CarrierDetector.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::CIDR.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::CarrierLetter.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::Display.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::Encoding.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::IS.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::IS::DoCoMo.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::IS::EZweb.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::IS::ThirdForce.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::UserID.3pm
-/tmp/xy1rECOSkm/outputdir/man/man3/HTTP::MobileAttribute::Plugin::XHTMLCompliant.3pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/AirHPhone.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/Base.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/DoCoMo.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/EZweb.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/NonMobile.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Agent/ThirdForce.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Attribute/CarrierMethod.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/CarrierDetector.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/CIDR.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/CarrierLetter.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/Core.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/Display.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/Encoding.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/GPS.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/IS.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/IS/DoCoMo.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/IS/EZweb.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/IS/ThirdForce.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/UserID.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Plugin/XHTMLCompliant.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Request.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Request/APRTable.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Request/Apache.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Request/Env.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/HTTP/MobileAttribute/Request/HTTPHeaders.pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Agent::Base.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Attribute::CarrierMethod.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::CarrierDetector.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::CIDR.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::CarrierLetter.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::Display.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::Encoding.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::IS.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::IS::DoCoMo.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::IS::EZweb.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::IS::ThirdForce.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::UserID.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/HTTP::MobileAttribute::Plugin::XHTMLCompliant.3pm
 /usr/local/man/man3/HTTP::MobileAttribute.3pm
 /usr/local/man/man3/HTTP::MobileAttribute::Agent::Base.3pm
 /usr/local/man/man3/HTTP::MobileAttribute::Attribute::CarrierMethod.3pm
@@ -75,6 +76,7 @@
 /usr/local/share/perl/5.8.8/HTTP/MobileAttribute/Plugin/UserID.pm
 /usr/local/share/perl/5.8.8/HTTP/MobileAttribute/Plugin/XHTMLCompliant.pm
 /usr/local/share/perl/5.8.8/HTTP/MobileAttribute/Request.pm
+/usr/local/share/perl/5.8.8/HTTP/MobileAttribute/Request/APRTable.pm
 /usr/local/share/perl/5.8.8/HTTP/MobileAttribute/Request/Apache.pm
 /usr/local/share/perl/5.8.8/HTTP/MobileAttribute/Request/Env.pm
 /usr/local/share/perl/5.8.8/HTTP/MobileAttribute/Request/HTTPHeaders.pm
diff --git a/extlib/i486-linux-gnu-thread-multi/auto/UNIVERSAL/require/.packlist b/extlib/i486-linux-gnu-thread-multi/auto/UNIVERSAL/require/.packlist
index 4303a03b..f74aadd6 100644
--- a/extlib/i486-linux-gnu-thread-multi/auto/UNIVERSAL/require/.packlist
+++ b/extlib/i486-linux-gnu-thread-multi/auto/UNIVERSAL/require/.packlist
@@ -1,4 +1,4 @@
-/tmp/4jKHfS9U7o/outputdir/lib/perl5/UNIVERSAL/require.pm
-/tmp/4jKHfS9U7o/outputdir/man/man3/UNIVERSAL::require.3pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/UNIVERSAL/require.pm
+/tmp/RR9supEmoQ/outputdir/man/man3/UNIVERSAL::require.3pm
 /usr/local/man/man3/UNIVERSAL::require.3pm
 /usr/local/share/perl/5.8.8/UNIVERSAL/require.pm
diff --git a/extlib/i486-linux-gnu-thread-multi/auto/YAML/.packlist b/extlib/i486-linux-gnu-thread-multi/auto/YAML/.packlist
index b632b615..4183dddf 100644
--- a/extlib/i486-linux-gnu-thread-multi/auto/YAML/.packlist
+++ b/extlib/i486-linux-gnu-thread-multi/auto/YAML/.packlist
@@ -1,29 +1,29 @@
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/Test/YAML.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Any.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Base.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Dumper.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Dumper/Base.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Error.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Loader.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Loader/Base.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Marshall.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Node.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Tag.pm
-/tmp/CWMqaIhhOD/outputdir/lib/perl5/YAML/Types.pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/Test::YAML.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Any.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Base.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Dumper.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Dumper::Base.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Error.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Loader.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Loader::Base.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Marshall.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Node.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Tag.3pm
-/tmp/CWMqaIhhOD/outputdir/man/man3/YAML::Types.3pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/Test/YAML.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Any.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Base.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Dumper.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Dumper/Base.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Error.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Loader.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Loader/Base.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Marshall.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Node.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Tag.pm
+/tmp/RR9supEmoQ/outputdir/lib/perl5/YAML/Types.pm
+/tmp/RR9supEmoQ/outputdir/man/man3/Test::YAML.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Any.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Base.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Dumper.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Dumper::Base.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Error.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Loader.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Loader::Base.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Marshall.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Node.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Tag.3pm
+/tmp/RR9supEmoQ/outputdir/man/man3/YAML::Types.3pm
 /usr/local/bin/ysh
 /usr/local/man/man1/ysh.1p
 /usr/local/man/man3/Test::YAML.3pm
diff --git a/extlib/i486-linux-gnu-thread-multi/perllocal.pod b/extlib/i486-linux-gnu-thread-multi/perllocal.pod
index dd703f6b..4958b143 100644
--- a/extlib/i486-linux-gnu-thread-multi/perllocal.pod
+++ b/extlib/i486-linux-gnu-thread-multi/perllocal.pod
@@ -1,10 +1,10 @@
-=head2 Tue Feb 10 20:16:26 2009: C<Module> L<YAML|YAML>
+=head2 Tue Feb 10 20:17:30 2009: C<Module> L<YAML|YAML>
 
 =over 4
 
 =item *
 
-C<installed into: /tmp/CWMqaIhhOD/outputdir/lib/perl5>
+C<installed into: /tmp/RR9supEmoQ/outputdir/lib/perl5>
 
 =item *
 
@@ -20,3 +20,157 @@ C<EXE_FILES: >
 
 =back
 
+=head2 Tue Feb 10 20:17:32 2009: C<Module> L<Carp::Clan|Carp::Clan>
+
+=over 4
+
+=item *
+
+C<installed into: /tmp/RR9supEmoQ/outputdir/lib/perl5>
+
+=item *
+
+C<LINKTYPE: dynamic>
+
+=item *
+
+C<VERSION: 6.00>
+
+=item *
+
+C<EXE_FILES: >
+
+=back
+
+=head2 Tue Feb 10 20:17:33 2009: C<Module> L<Class::Data::Inheritable|Class::Data::Inheritable>
+
+=over 4
+
+=item *
+
+C<installed into: /tmp/RR9supEmoQ/outputdir/lib/perl5>
+
+=item *
+
+C<LINKTYPE: dynamic>
+
+=item *
+
+C<VERSION: 0.08>
+
+=item *
+
+C<EXE_FILES: >
+
+=back
+
+=head2 Tue Feb 10 20:17:35 2009: C<Module> L<Class::Inspector|Class::Inspector>
+
+=over 4
+
+=item *
+
+C<installed into: /tmp/RR9supEmoQ/outputdir/lib/perl5>
+
+=item *
+
+C<LINKTYPE: dynamic>
+
+=item *
+
+C<VERSION: 1.23>
+
+=item *
+
+C<EXE_FILES: >
+
+=back
+
+=head2 Tue Feb 10 20:17:36 2009: C<Module> L<Class::Accessor|Class::Accessor>
+
+=over 4
+
+=item *
+
+C<installed into: /tmp/RR9supEmoQ/outputdir/lib/perl5>
+
+=item *
+
+C<LINKTYPE: dynamic>
+
+=item *
+
+C<VERSION: 0.31>
+
+=item *
+
+C<EXE_FILES: >
+
+=back
+
+=head2 Tue Feb 10 20:17:37 2009: C<Module> L<UNIVERSAL::require|UNIVERSAL::require>
+
+=over 4
+
+=item *
+
+C<installed into: /tmp/RR9supEmoQ/outputdir/lib/perl5>
+
+=item *
+
+C<LINKTYPE: dynamic>
+
+=item *
+
+C<VERSION: 0.11>
+
+=item *
+
+C<EXE_FILES: >
+
+=back
+
+=head2 Tue Feb 10 20:17:39 2009: C<Module> L<Class::Component|Class::Component>
+
+=over 4
+
+=item *
+
+C<installed into: /tmp/RR9supEmoQ/outputdir/lib/perl5>
+
+=item *
+
+C<LINKTYPE: dynamic>
+
+=item *
+
+C<VERSION: 0.17>
+
+=item *
+
+C<EXE_FILES: >
+
+=back
+
+=head2 Tue Feb 10 20:17:44 2009: C<Module> L<HTTP::MobileAttribute|HTTP::MobileAttribute>
+
+=over 4
+
+=item *
+
+C<installed into: /tmp/RR9supEmoQ/outputdir/lib/perl5>
+
+=item *
+
+C<LINKTYPE: dynamic>
+
+=item *
+
+C<VERSION: 0.13>
+
+=item *
+
+C<EXE_FILES: >
+
+=back
+