diff --git a/antlr-maven-plugin.spec b/antlr-maven-plugin.spec
index 378f2c5..5091837 100644
--- a/antlr-maven-plugin.spec
+++ b/antlr-maven-plugin.spec
@@ -1,20 +1,25 @@
 Name:			antlr-maven-plugin
 Version:		2.2
-Release:		3%{?dist}
+Release:		4%{?dist}
 Summary:		Maven plugin that generates files based on grammar file(s)
 License:		ASL 2.0
 URL:			http://mojo.codehaus.org/antlr-maven-plugin/
 Group:			Development/Libraries
+
 Source0:		http://repo1.maven.org/maven2/org/codehaus/mojo/%{name}/%{version}/%{name}-%{version}-source-release.zip
+
 # Modern modello expects to see <models></models>, even if there is only one.
 Patch0:			maven-antlr-plugin-2.2-modello-issue.patch
 # siteRenderer.createSink doesn't exist anymore
 Patch2:			maven-antlr-plugin-2.1-sinkfix.patch
+
 BuildArch:		noarch
+
 BuildRequires:		java-devel
 BuildRequires:		jpackage-utils
 BuildRequires:		antlr
 BuildRequires:		maven
+BuildRequires:		maven-enforcer-plugin
 BuildRequires:		maven-compiler-plugin
 BuildRequires:		maven-install-plugin
 BuildRequires:		maven-jar-plugin
@@ -32,13 +37,14 @@ BuildRequires:		maven-plugin-bundle
 BuildRequires:		maven-plugin-cobertura
 BuildRequires:		apache-commons-exec
 BuildRequires:		maven2-common-poms
+BuildRequires:		modello
+
 Requires:		antlr
 Requires:       maven
 Requires:		jpackage-utils
 Requires:		apache-commons-exec
 Requires:		java >= 1:1.6.0
-Requires(post):		jpackage-utils
-Requires(postun):	jpackage-utils
+
 Provides:		maven2-plugin-antlr = %{version}-%{release}
 Obsoletes:		maven2-plugin-antlr <= 2.0.8
 
@@ -67,7 +73,7 @@ find -name '*.jar' -exec rm -f '{}' \;
 
 %build
 mvn-rpmbuild -Dmaven.test.skip=true \
-install javadoc:javadoc
+install javadoc:aggregate
 
 %install
 mkdir -p %{buildroot}%{_javadir}
@@ -78,26 +84,23 @@ mkdir -p %{buildroot}%{_javadocdir}/%{name}
 cp -rp target/site/apidocs/ %{buildroot}%{_javadocdir}/%{name}
 
 install -d -m 755 %{buildroot}%{_mavenpomdir}
-%add_to_maven_depmap org.codehaus.mojo %{name} %{version} JPP %{name}
 install -pm 644 pom.xml %{buildroot}%{_mavenpomdir}/JPP-%{name}.pom
 
-%post
-%update_maven_depmap
-
-%postun
-%update_maven_depmap
+%add_maven_depmap JPP-%{name}.pom %{name}.jar
 
 %files
-%defattr(-,root,root,-)
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/%{name}*.jar
+%{_mavenpomdir}/JPP-%{name}.pom
+%{_mavendepmapfragdir}/%{name}
+%{_javadir}/%{name}.jar
 
 %files javadoc
-%defattr(-,root,root,-)
 %{_javadocdir}/%{name}
 
 %changelog
+* Mon Dec 05 2011 Tomas Radej <tradej@redhat.com> - 2.2-4
+- Modello + maven-enforcer-plugin BR
+- Guideline fixes
+
 * Thu Apr 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 2.2-3
 - Add apache-commons-exec to R