diff --git a/plexus-sec-dispatcher.spec b/plexus-sec-dispatcher.spec
index 120e466..b4fc117 100644
--- a/plexus-sec-dispatcher.spec
+++ b/plexus-sec-dispatcher.spec
@@ -1,39 +1,36 @@
 Name:           plexus-sec-dispatcher
 Version:        1.4
-Release:        18%{?dist}
+Release:        19%{?dist}
 Summary:        Plexus Security Dispatcher Component
 License:        ASL 2.0
 URL:            https://github.com/codehaus-plexus/plexus-sec-dispatcher
 BuildArch:      noarch
 
-#svn export http://svn.sonatype.org/spice/tags/plexus-sec-dispatcher-1.4/
-#tar jcf plexus-sec-dispatcher-1.4.tar.bz2 plexus-sec-dispatcher-1.4/
+# svn export http://svn.sonatype.org/spice/tags/plexus-sec-dispatcher-1.4/
+# tar jcf plexus-sec-dispatcher-1.4.tar.bz2 plexus-sec-dispatcher-1.4/
 Source0:        %{name}-%{version}.tar.bz2
 
-#Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4.
-Patch0:        %{name}-pom.patch
+# Removed maven-compiler-plugin configuration version in the pom as annotations isn't available in version 1.4.
+Patch0:         %{name}-pom.patch
 
-BuildRequires: maven-local
-BuildRequires: modello
-BuildRequires: plexus-utils
-BuildRequires: plexus-cipher
-BuildRequires: plexus-containers-component-metadata
-
-Requires:       jpackage-utils
-Requires:       java-headless
+BuildRequires:  maven-local
+BuildRequires:  mvn(junit:junit)
+BuildRequires:  mvn(org.codehaus.modello:modello-maven-plugin)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-component-metadata)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-container-default)
+BuildRequires:  mvn(org.codehaus.plexus:plexus-utils)
+BuildRequires:  mvn(org.sonatype.plexus:plexus-cipher)
+BuildRequires:  mvn(org.sonatype.spice:spice-parent:pom:)
 
 %description
 Plexus Security Dispatcher Component
 
 %package javadoc
-Group:          Documentation
 Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
 
 %description javadoc
 API documentation for %{name}.
 
-
 %prep
 %setup -q
 %patch0 -p1
@@ -50,6 +47,9 @@ API documentation for %{name}.
 %files javadoc -f .mfiles-javadoc
 
 %changelog
+* Tue Apr 21 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-19
+- Cleanup spec file
+
 * Wed Apr  1 2015 Mikolaj Izdebski <mizdebsk@redhat.com> - 1.4-18
 - Update upstream URL