diff --git a/lib/MDV/Repsys.pm b/lib/MDV/Repsys.pm
index 3f6648b..ad8e823 100644
--- a/lib/MDV/Repsys.pm
+++ b/lib/MDV/Repsys.pm
@@ -16,7 +16,9 @@ use File::Temp qw(tempdir);
 use File::Path;
 use File::Spec;
 use POSIX qw(setlocale LC_ALL);
-use RPM4;
+use RPM;
+use RPM::Header;
+use RPM::Spec;
 
 use SVN::Client;
 use SVN::Core;
@@ -164,9 +166,9 @@ sub unpack_package {
     $self->_set_rpm_dirs_from_topdir($destdir);
 
     # make rpm output informations starting from log level 4
-    RPM4::setverbosity($self->{verbosity} >= 4 ? $self->{verbosity} + 2 : 0);
-    my ($specfile) = RPM4::installsrpm($rpmfile);
-    RPM4::setverbosity(0);
+    RPM::setverbosity($self->{verbosity} >= 4 ? $self->{verbosity} + 2 : 0);
+    my ($specfile) = RPM::installsrpm($rpmfile);
+    RPM::setverbosity(0);
 
     return $specfile;
 }
@@ -182,15 +184,15 @@ sub find_current_sources {
     my ($self, $workdir) = @_;
 
     $self->_set_rpm_dirs_from_topdir($workdir);
-    my $specfile = (glob(RPM4::expand('%_specdir/*.spec')))[0]
+    my $specfile = (glob(RPM::expand_macro('%_specdir/*.spec')))[0]
         or croak "Can't find any spec file\n";
     $self->_print_msg(3, 'Looking sources from spec file %s', $specfile);
    
-    my $spec = RPM4::Spec->new($specfile, anyarch => 1, force => 0)
+    my $spec = RPM::Spec->new($specfile, anyarch => 1, force => 0)
         or croak "Can't parse spec file $specfile\n";
 
     my @sources = ( $specfile ); # specfile should be first !
-    my $sourcedir = RPM4::expand('%_sourcedir');
+    my $sourcedir = RPM::expand_macro('%_sourcedir');
     foreach my $file ($spec->sources(), $spec->icon()) {
         push(@sources, "$sourcedir/$file");
     }
@@ -721,7 +723,7 @@ sub add_changelog_to_spec {
     $self->_print_msg(3, 'Adding changelog to spec file %s', $specfile);
 
     $self->_set_rpm_dirs_from_specfile($specfile);
-    my $spec = RPM4::Spec->new($specfile, anyarch => 1, force => 1)
+    my $spec = RPM::Spec->new($specfile, anyarch => 1, force => 1)
         or croak "Can't parse specfile $specfile\n";
     my $header = $spec->srcheader();
     my $package = $header->queryformat('%{NAME}');
@@ -969,7 +971,7 @@ Submit package just after being imported
 sub import_package {
     my ($self, $rpmfile, %options) = @_;
 
-    my $header = RPM4::Header->new($rpmfile)
+    my $header = rpm2header($rpmfile)
         or croak "Can't read rpm file $rpmfile\n";
     if ($header->hastag('SOURCERPM')) {
         croak "$rpmfile is not a source package\n";
@@ -1267,7 +1269,7 @@ sub tag_package {
 
     close($file);
 
-    my $spec = RPM4::Spec->new($file, anyarch => 1, force => 1)
+    my $spec = RPM::Spec->new($file, anyarch => 1, force => 1)
         or croak "Can't parse spec file from $url\n";
     my $header = $spec->srcheader;
 
@@ -1602,7 +1604,7 @@ sub update_package {
 
     my $spec_file =
         $options{specfile} ||
-        (glob(RPM4::expand('%_specdir/*.spec')))[0];
+        (glob(RPM::expand_macro('%_specdir/*.spec')))[0];
 
     Youri::Package::RPM::Updater->require(qv('0.4.0')) or croak $@;
     my $updater = Youri::Package::RPM::Updater->new(
@@ -1763,7 +1765,7 @@ sub _set_rpm_dirs_from_topdir {
         if ($path !~ /^\//) {
             $path = "$topdir/$path";
         }
-        RPM4::add_macro("_$name $path");
+        RPM::add_macro("_$name $path");
     }
 }
 
@@ -1786,7 +1788,7 @@ sub _create_rpm_dirs {
     @dirs = keys %rpm_dirs unless @dirs;
 
     foreach my $name (@dirs) {
-        my $path = RPM4::expand("%_$name");
+        my $path = RPM::expand_macro("%_$name");
         if (! -d $path) {
             $self->_print_msg(5, 'Creating directory %s', $path);
             if (!mkdir($path)) {