diff --git a/perl-File-BaseDir.spec b/perl-File-BaseDir.spec
index 5397c1b..832f3e9 100644
--- a/perl-File-BaseDir.spec
+++ b/perl-File-BaseDir.spec
@@ -1,6 +1,6 @@
 Name:           perl-File-BaseDir
 Version:        0.06
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Use the Freedesktop.org base directory specification
 License:        GPL+ or Artistic
 Group:          Development/Libraries
@@ -17,6 +17,8 @@ BuildRequires:  perl(IPC::System::Simple)
 BuildRequires:  perl(parent)
 BuildRequires:  perl(strict)
 BuildRequires:  perl(warnings)
+# Optional run-time:
+BuildRequires:  xdg-user-dirs
 # Tests
 BuildRequires:  perl(Config)
 BuildRequires:  perl(File::Spec::Functions)
@@ -33,6 +35,18 @@ cache data. It is suggested that desktop applications for e.g. the Gnome,
 KDE or Xfce platforms follow this layout. However, the same layout can just
 as well be used for non-GUI applications.
 
+%package -n perl-File-UserDirs
+Summary:        Find extra media and documents Freedesktop.org directories
+Requires:       perl(:MODULE_COMPAT_%(eval "`perl -V:version`"; echo $version))
+# This package does not make sense without xdg-user-dirs
+Requires:       xdg-user-dirs
+
+%description -n perl-File-UserDirs
+File::UserDirs Perl module can be used to find directories as informally
+specified by the Freedesktop.org xdg-user-dirs software. This gives
+a mechanism to locate extra directories for media and documents files.
+
+
 %prep
 %setup -q -n File-BaseDir-%{version}
 
@@ -51,9 +65,20 @@ make test
 %files
 %doc Changes README
 %{perl_vendorlib}/*
+%exclude %{perl_vendorlib}/File/UserDirs.pm
 %{_mandir}/man3/*
+%exclude %{_mandir}/man3/File::UserDirs.3pm.gz
+
+%files -n perl-File-UserDirs
+%doc Changes README
+%dir %{perl_vendorlib}/File
+%{perl_vendorlib}/File/UserDirs.pm
+%{_mandir}/man3/File::UserDirs.3pm.gz
 
 %changelog
+* Tue Apr 21 2015 Petr Pisar <ppisar@redhat.com> - 0.06-2
+- Sub-package File::UserDirs
+
 * Tue Apr 07 2015 Jitka Plesnikova <jplesnik@redhat.com> - 0.06-1
 - 0.06 bump