diff --git a/.gitignore b/.gitignore
index c89a2f3..8e5bada 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ XML-Twig-3.34.tar.gz
 /XML-Twig-3.37.tar.gz
 /XML-Twig-3.38.tar.gz
 /XML-Twig-3.39.tar.gz
+/XML-Twig-3.40.tar.gz
diff --git a/perl-XML-Twig.spec b/perl-XML-Twig.spec
index 03fae98..a42f146 100644
--- a/perl-XML-Twig.spec
+++ b/perl-XML-Twig.spec
@@ -1,6 +1,6 @@
 Name:           perl-XML-Twig
-Version:        3.39
-Release:        4%{?dist}
+Version:        3.40
+Release:        1%{?dist}
 Summary:        Perl module for processing huge XML documents in tree mode
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -56,7 +56,7 @@ BuildRequires:  perl(XML::Simple)
 BuildRequires:  perl(XML::XPathEngine)
 BuildRequires:  perl(XML::XPath)
 Requires:       perl(XML::Parser) >= 2.34
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 
 %{?perl_default_filter}
 
@@ -83,7 +83,7 @@ twig_print_outside_roots options.
 %setup -q -n XML-Twig-%{version}
 
 %build
-%{__perl} Makefile.PL -y INSTALLDIRS=perl
+perl Makefile.PL -y INSTALLDIRS=perl
 make %{?_smp_mflags}
 cp Changes Changes.orig
 iconv -f iso88591 -t utf8 < Changes.orig > Changes
@@ -98,7 +98,6 @@ find $RPM_BUILD_ROOT -depth -type d -exec rmdir {} 2>/dev/null \;
 make test
 
 %files
-%defattr(-,root,root,-)
 %doc Changes README 
 %{perl_privlib}/*
 %{_bindir}/*
@@ -106,6 +105,10 @@ make test
 %{_mandir}/man3/*
 
 %changelog
+* Fri May 11 2012 Petr Šabata <contyk@redhat.com> - 3.40-1
+- 3.40 bump
+- Dropping defattr and perl command macros
+
 * Thu Apr 19 2012 Marcela Mašláňová <mmaslano@redhat.com> - 3.39-4
 - make module Kwalitee conditional
 
diff --git a/sources b/sources
index bf44f76..54f450c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c3f42ee3f09fe7b0601172ddb15bfe53  XML-Twig-3.39.tar.gz
+0a2363312c26b2f62e621dc41846ea0d  XML-Twig-3.40.tar.gz