diff --git a/perl-LDAP.spec b/perl-LDAP.spec
index 11276d2..d226a3f 100644
--- a/perl-LDAP.spec
+++ b/perl-LDAP.spec
@@ -1,6 +1,6 @@
 Name:           perl-LDAP
 Version:        0.49
-Release:        1%{?dist}
+Release:        2%{?dist}
 Epoch:          1
 Summary:        LDAP Perl module
 Group:          Development/Libraries
@@ -9,10 +9,12 @@ URL:            http://search.cpan.org/dist/perl-ldap/
 Source0:        http://www.cpan.org/authors/id/M/MA/MARSCHAP/perl-ldap-%{version}.tar.gz
 BuildArch:      noarch
 # [Core Features]
+BuildRequires:  perl(base)
 BuildRequires:  perl(Carp)
 BuildRequires:  perl(constant)
 BuildRequires:  perl(Convert::ASN1)
 BuildRequires:  perl(Encode)
+BuildRequires:  perl(Exporter)
 BuildRequires:  perl(HTTP::Status)
 BuildRequires:  perl(HTTP::Negotiate)
 BuildRequires:  perl(HTTP::Response)
@@ -22,6 +24,7 @@ BuildRequires:  perl(IO::Select)
 BuildRequires:  perl(IO::Socket)
 BuildRequires:  perl(IO::Socket::SSL)
 BuildRequires:  perl(IO::Socket::INET6)
+BuildRequires:  perl(JSON)
 BuildRequires:  perl(LWP::MediaTypes)
 BuildRequires:  perl(LWP::Protocol)
 BuildRequires:  perl(Socket)
@@ -33,9 +36,11 @@ BuildRequires:  perl(XML::SAX::Base)
 BuildRequires:  perl(XML::SAX::Writer)
 # [test]
 BuildRequires:  perl(Data::Dumper)
+BuildRequires:  perl(File::Path)
+BuildRequires:  perl(File::Spec)
 BuildRequires:  perl(Test::More)
 BuildRequires:  perl(LWP::UserAgent)
-Requires:       perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
 Requires:       perl(Authen::SASL)
 
 # Remove under-specified dependencies
@@ -46,25 +51,23 @@ Net::LDAP is a collection of modules that implements a LDAP services API
 for Perl programs. The module may be used to search directories or perform
 maintenance functions such as adding, deleting or modifying entries.
 
-
 %prep
 %setup -q -n perl-ldap-%{version}
 chmod -c 644 bin/* contrib/* lib/Net/LDAP/DSML.pm
-%{__perl} -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' contrib/*
-
+perl -pi -e 's|^#!/usr/local/bin/perl\b|#!%{__perl}|' contrib/*
 # Remove bundled libraries
 rm -rf inc
 sed -i -e '/^inc\// d' MANIFEST
 find -type f -exec chmod -x {} +
 
 %build
-%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null
+perl Makefile.PL INSTALLDIRS=vendor < /dev/null
 make %{?_smp_mflags}
 
 %install
-make pure_install DESTDIR=$RPM_BUILD_ROOT
-find $RPM_BUILD_ROOT -type f -name .packlist -exec rm -f {} ';'
-chmod -R u+w $RPM_BUILD_ROOT/*
+make pure_install DESTDIR=%{buildroot}
+find %{buildroot} -type f -name .packlist -exec rm -f {} ';'
+chmod -R u+w %{buildroot}/*
 
 %check
 make test
@@ -77,8 +80,12 @@ make test
 %{perl_vendorlib}/Net/
 %{_mandir}/man3/*.3pm*
 
-
 %changelog
+* Tue Nov 20 2012 Petr Šabata <contyk@redhat.com> - 1:0.49-2
+- Add a few missing deps
+- Drop command macros
+- Modernize the spec
+
 * Mon Oct 08 2012 Petr Pisar <ppisar@redhat.com> - 1:0.49-1
 - 0.49 bump