diff --git a/perl-XML-Grove.spec b/perl-XML-Grove.spec
index cc76bd0..f977786 100644
--- a/perl-XML-Grove.spec
+++ b/perl-XML-Grove.spec
@@ -1,17 +1,13 @@
+%global cpan_version 0.46alpha
 Name:           perl-XML-Grove
-# The version is against the guidelines. However adherence to the
-# guideline would imply using an epoch, which is very inconvenient.
-# Given that this package's development is stalled since Sep 1999, and
-# hoping that upstream skip one version to go straight to 0.47, it seems
-# better not to use an epoch. If 0.46 is ever released, the epoch way
-# would have to be used, but we are better avoiding that if possible.
-Version:        0.46alpha
-Release:        63%{?dist}
+Epoch:          1
+Version:        0.46
+Release:        0.1.alpha%{?dist}
 Summary:        Simple access to infoset of parsed XML, HTML, or SGML instances
 
 License:        GPL+ or Artistic
 URL:            http://search.cpan.org/dist/XML-Grove/
-Source0:        http://www.cpan.org/authors/id/K/KM/KMACLEOD/XML-Grove-%{version}.tar.gz
+Source0:        http://www.cpan.org/authors/id/K/KM/KMACLEOD/XML-Grove-%{cpan_version}.tar.gz
 Patch1:         perl-XML-Grove-test.patch
 # Patch is based on upstream changes
 # see http://perl-xml.cvs.sourceforge.net/perl-xml/XML-Grove/COPYING?revision=1.2&view=markup
@@ -45,7 +41,7 @@ the objects using normal Perl syntax.
 %global __requires_exclude %{?__requires_exclude:%__requires_exclude|}^perl\\(XML::Parser::PerlSAX\\)$
 
 %prep
-%setup -q -n XML-Grove-%{version}
+%setup -q -n XML-Grove-%{cpan_version}
 %patch1 -p1 -b .test
 %patch2 -p1
 
@@ -71,6 +67,9 @@ make test
 
 
 %changelog
+* Tue Jun 06 2017 Petr Pisar <ppisar@redhat.com> - 1:0.46-0.1.alpha
+- Make package version conformant to packaging guidelines
+
 * Mon Jun 05 2017 Jitka Plesnikova <jplesnik@redhat.com> - 0.46alpha-63
 - Perl 5.26 rebuild