.gear-rules                                        |    2 +
 .../1df73e514eb08c2710f45e9536ed842dff9e6914       |   13 ++++
 .../e327c958b3d9730e5daf1436e9bfdfc907f28d68       |   13 ++++
 .gear-tags/list                                    |    2 +
 Build.PL                                           |    1 +
 Makefile.PL                                        |    3 +-
 lib/version.pm                                     |   16 ++----
 perl-version.spec                                  |   59 ++++++++++++++++++++
 vutil/lib/version/vxs.pm                           |    8 +--
 9 files changed, 100 insertions(+), 17 deletions(-)

diff --git a/.gear-rules b/.gear-rules
new file mode 100644
index 0000000..bf57a49
--- /dev/null
+++ b/.gear-rules
@@ -0,0 +1,2 @@
+tar: @version@:. name=version-@version@
+diff: @version@:. . name=perl-version-@version@-@release@.patch
diff --git a/.gear-tags/1df73e514eb08c2710f45e9536ed842dff9e6914 b/.gear-tags/1df73e514eb08c2710f45e9536ed842dff9e6914
new file mode 100644
index 0000000..f79684d
--- /dev/null
+++ b/.gear-tags/1df73e514eb08c2710f45e9536ed842dff9e6914
@@ -0,0 +1,13 @@
+object fcaa369573fd924c69fef502c64ac27c57214f22
+type commit
+tag 0.73
+tagger Alexey Tourbin <at@altlinux.ru> 1191165838 +0400
+
+0.73
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQBG/7+OfBKgtDjnu0YRAszqAKDJwrWuEGht+NNbWrPfXRvpbQ7XBwCeIyWb
+LE1f9OA4VNMjQ8I1zXP+WAM=
+=bjwy
+-----END PGP SIGNATURE-----
diff --git a/.gear-tags/e327c958b3d9730e5daf1436e9bfdfc907f28d68 b/.gear-tags/e327c958b3d9730e5daf1436e9bfdfc907f28d68
new file mode 100644
index 0000000..1a8e76b
--- /dev/null
+++ b/.gear-tags/e327c958b3d9730e5daf1436e9bfdfc907f28d68
@@ -0,0 +1,13 @@
+object 544712c9852343ec0478ed0d360f35f740e06a98
+type commit
+tag 0.74
+tagger Alexey Tourbin <at@altlinux.ru> 1193421248 +0400
+
+0.74
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.7 (GNU/Linux)
+
+iD8DBQBHIinBfBKgtDjnu0YRAiq6AKDeRi4nykCYWDvr3UI5Opls4M0nkACgrfV/
+xviQ1KA1dT20wH05GCpOGU4=
+=fRKx
+-----END PGP SIGNATURE-----
diff --git a/.gear-tags/list b/.gear-tags/list
new file mode 100644
index 0000000..0d4bfd4
--- /dev/null
+++ b/.gear-tags/list
@@ -0,0 +1,2 @@
+1df73e514eb08c2710f45e9536ed842dff9e6914 0.73
+e327c958b3d9730e5daf1436e9bfdfc907f28d68 0.74
diff --git a/Build.PL b/Build.PL
index 746e9bd..9caff13 100644
--- a/Build.PL
+++ b/Build.PL
@@ -57,6 +57,7 @@ else {
     $build_arguments{module_name} = 'version::vxs';
     $build_arguments{pm_files} = {
 	'./lib/version.pm' => './lib/version.pm',
+	'./vperl/vpp.pm' => './lib/version/vpp.pm',
 	'./vutil/lib/version/vxs.pm' => './lib/version/vxs.pm'
     };
     $build_arguments{xs_files} = {
diff --git a/Makefile.PL b/Makefile.PL
index aefdb94..62735a7 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -47,7 +47,8 @@ sub write_makefile
                    ), 
                    PM              => 
                        {'lib/version.pm'  => '$(INST_LIBDIR)/version.pm',
-                        'lib/version.pod' => '$(INST_LIBDIR)/version.pod'},
+                        'lib/version.pod' => '$(INST_LIBDIR)/version.pod',
+                        'vperl/vpp.pm'    => '$(INST_LIBDIR)/version/vpp.pm'},
                    PL_FILES        => {},
 
                    clean           => { FILES => 'vutil/Makefile.PL' },
diff --git a/lib/version.pm b/lib/version.pm
index d833c2f..f9e0597 100644
--- a/lib/version.pm
+++ b/lib/version.pm
@@ -10,17 +10,11 @@ $VERSION = 0.74;
 
 $CLASS = 'version';
 
-eval "use version::vxs $VERSION";
-if ( $@ ) { # don't have the XS version installed
-    eval "use version::vpp $VERSION"; # don't tempt fate
-    die "$@" if ( $@ );
-    push @ISA, "version::vpp";
-    *version::qv = \&version::vpp::qv;
-}
-else { # use XS module
-    push @ISA, "version::vxs";
-    *version::qv = \&version::vxs::qv;
-}
+require version::vxs;
+version::vxs->VERSION($VERSION);
+
+@ISA = qw(version::vxs);
+*version::qv = \&version::vxs::qv;
 
 # Preloaded methods go here.
 sub import {
diff --git a/perl-version.spec b/perl-version.spec
new file mode 100644
index 0000000..0132c69
--- /dev/null
+++ b/perl-version.spec
@@ -0,0 +1,59 @@
+%define dist version
+Name: perl-%dist
+Version: 0.74
+Release: alt1
+
+Summary: Perl extension for Version Objects
+License: GPL or Artistic
+Group: Development/Perl
+
+URL: %CPAN %dist
+Source: %dist-%version.tar
+Patch: %name-%version-%release.patch
+
+# Automatically added by buildreq on Fri Oct 26 2007
+BuildRequires: perl-devel
+
+%description
+Overloaded version objects for all versions of Perl.  This module
+implements all of the features of version objects which will be part
+of Perl 5.10.0 except automatic version object creation.
+
+%prep
+%setup -q -n %dist-%version
+%patch -p1
+mv Build.PL Build.PL.orig
+
+%build
+%perl_vendor_build --xs
+
+%install
+%perl_vendor_install
+
+%files
+%doc	Changes README
+	%perl_vendor_archlib/version.pm
+%doc	%perl_vendor_archlib/version.pod
+%dir	%perl_vendor_archlib/version
+	%perl_vendor_archlib/version/*.pm
+%dir	%perl_vendor_autolib/version
+	%perl_vendor_autolib/version/*
+
+%changelog
+* Fri Oct 26 2007 Alexey Tourbin <at@altlinux.ru> 0.74-alt1
+- 0.73 -> 0.74
+
+* Sun Sep 30 2007 Alexey Tourbin <at@altlinux.ru> 0.73-alt1
+- 0.7203 -> 0.73
+
+* Wed Aug 15 2007 Alexey Tourbin <at@altlinux.ru> 0.72.03-alt2
+- build with ExtUtils::MakeMaker instead of Module::Build
+- version.pm: explicitly use version::vxs (without version::vpp fallback)
+- but always install version/vpp.pm, just for reference
+- version/vxs.pm: use XSLoader instead of DynaLoader
+
+* Mon Aug 13 2007 Alexey Tourbin <at@altlinux.ru> 0.72.03-alt1
+- 0.48 -> 0.7203 (#11939)
+
+* Sat Sep 24 2005 Alexey Tourbin <at@altlinux.ru> 0.48-alt1
+- initial revision
diff --git a/vutil/lib/version/vxs.pm b/vutil/lib/version/vxs.pm
index 889f74c..d0e9444 100644
--- a/vutil/lib/version/vxs.pm
+++ b/vutil/lib/version/vxs.pm
@@ -4,17 +4,15 @@ package version::vxs;
 use 5.005_03;
 use strict;
 
-require DynaLoader;
-use vars qw(@ISA $VERSION $CLASS );
-
-@ISA = qw(DynaLoader);
+use vars qw($VERSION $CLASS);
 
 $VERSION = 0.74;
 
 $CLASS = 'version::vxs';
 
 local $^W; # shut up the 'redefined' warning for UNIVERSAL::VERSION
-bootstrap version::vxs if $] < 5.009;
+require XSLoader;
+XSLoader::load(__PACKAGE__, $VERSION) if $] < 5.009;
 
 # Preloaded methods go here.