diff --git a/perl-SGMLSpm.spec b/perl-SGMLSpm.spec
index 740c737..6327853 100644
--- a/perl-SGMLSpm.spec
+++ b/perl-SGMLSpm.spec
@@ -1,61 +1,53 @@
-%define _use_internal_dependency_generator 0
+Name:           perl-SGMLpm
+Version:        1.03ii
+Release:        15
+Summary:        Perl library for parsing the output of nsgmls
 
-%define Name perl-SGMLSpm
-%define Version 1.03ii
-%define perldir %(perl -V:installvendorlib | sed 's/^installvendorlib=.\\(.*\\).;$/\\1/')
+Group:          Development/Libraries
+License:        GPL
+URL:            http://search.cpan.org/dist/SGMLSpm/
+Source0:    http://www.cpan.org/authors/id/D/DM/DMEGG/SGMLSpm-%{version}.tar.gz
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
-Name        	: %{Name}
-Version     	: %{Version}
-Release     	: 14
-Group       	: Applications/Text
+BuildArch:      noarch
+BuildRequires:  perl >= 1:5.6.1
+Requires:  perl(:MODULE_COMPAT_%(eval "`%{__perl} -V:version`"; echo $version))
+Requires:       openjade
 
-Summary     	: Perl library for parsing the output of nsgmls.
-
-License   	: GPL
-URL         	: http://www.megginson.com/Software/
-
-Requires    	: openjade
-Requires	: perl >= 5
-
-BuildRoot   	: %{_tmppath}/%{Name}-%{Version}
-
-BuildArch	: noarch
-Source0		: ftp://cpan.perl.org/pub/perl/CPAN/modules/by-module/SGMLS/SGMLSpm-%{Version}.tar.gz
-
-
-%Description
+%description
 Perl programs can use the SGMLSpm module to help convert SGML, HTML or XML
 documents into new formats.
 
 
-%Prep
-%setup -n SGMLSpm
+%prep
+%setup -q -n SGMLSpm
+
+%build
+
+%install
+rm -rf $RPM_BUILD_ROOT
+install -d -m 755 $RPM_BUILD_ROOT{%{_bindir},%{perl_vendorlib}}
+make install_system \
+    BINDIR=$RPM_BUILD_ROOT%{_bindir} \
+	PERL5DIR=$RPM_BUILD_ROOT%{perl_vendorlib}
+
+%check || :
+
+%clean
+rm -rf $RPM_BUILD_ROOT
 
 
-%Build
-
-
-%Install
-DESTDIR=$RPM_BUILD_ROOT
-rm -rf $DESTDIR
-mkdir -p $DESTDIR/usr/bin
-mkdir -p $DESTDIR/%{perldir}
-make install_system BINDIR=${DESTDIR}/usr/bin PERL5DIR=${DESTDIR}/%{perldir}
-
-
-%Clean
-DESTDIR=$RPM_BUILD_ROOT
-rm -rf $DESTDIR
-
-
-%Files
-%defattr (-,root,root)
-%doc BUGS COPYING ChangeLog DOC/ README TODO elisp
-/usr/bin/sgmlspl
-%{perldir}
+%files
+%defattr(-,root,root,-)
+%{_bindir}/sgmlspl
+%{perl_vendorlib}/SGMLS*
+%{perl_vendorlib}/skel.pl
 
 
 %changelog
+* Sat Apr 30 2005 Jose Pedro Oliveira <jpo at di.uminho.pt> - 1.03ii-15
+- Specfile cleanup. (#156483)
+
 * Wed Sep 22 2004 Than Ngo <than@redhat.com>
 - rebuilt