diff --git a/cal10n-fix-maven.patch b/cal10n-fix-maven.patch
deleted file mode 100644
index 289eca3..0000000
--- a/cal10n-fix-maven.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- maven-cal10n-plugin/pom.xml.sav	2010-07-05 20:10:06.000000000 +0300
-+++ maven-cal10n-plugin/pom.xml	2010-07-19 13:40:18.509985832 +0300
-@@ -32,6 +32,10 @@
-       <artifactId>maven-artifact-manager</artifactId>
-       <version>2.0.4</version>
-     </dependency>
-+    <dependency>                                                                                                                          
-+      <groupId>org.apache.maven</groupId>                                                                                                 
-+      <artifactId>maven-artifact</artifactId>                                                                                             
-+    </dependency>
- 
-     <dependency>
-       <groupId>ch.qos.cal10n</groupId>
diff --git a/cal10n.spec b/cal10n.spec
index 10ac1b9..9a8f0a5 100644
--- a/cal10n.spec
+++ b/cal10n.spec
@@ -1,33 +1,18 @@
 Name:           cal10n
 Version:        0.7.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Compiler assisted localization library (CAL10N)
-
-Group:          Development/Libraries
 License:        MIT
 URL:            http://cal10n.qos.ch
-Source0:        http://cal10n.qos.ch/dist/cal10n-%{version}.tar.gz
-Patch0:         %{name}-fix-maven.patch
-
-BuildArch: noarch
-
-BuildRequires: junit4
-BuildRequires: java-devel >= 1:1.6.0
-BuildRequires: maven-local
-BuildRequires: maven-assembly-plugin
-BuildRequires: maven-compiler-plugin
-BuildRequires: maven-install-plugin
-BuildRequires: maven-jar-plugin
-BuildRequires: maven-javadoc-plugin
-BuildRequires: maven-plugin-plugin
-BuildRequires: maven-resources-plugin
-BuildRequires: maven-source-plugin
-BuildRequires: maven-doxia-sitetools
-BuildRequires: maven-site-plugin
-BuildRequires: maven-surefire-plugin
-BuildRequires: maven-surefire-provider-junit4
-
-Requires:      java
+Source0:        http://cal10n.qos.ch/dist/%{name}-%{version}.tar.gz
+BuildArch:      noarch
+
+BuildRequires:  maven-local
+BuildRequires:  mvn(org.apache.maven.plugins:maven-site-plugin)
+BuildRequires:  mvn(org.apache.maven.plugins:maven-source-plugin)
+BuildRequires:  mvn(org.apache.maven:maven-artifact)
+BuildRequires:  mvn(org.apache.maven:maven-artifact-manager)
+BuildRequires:  mvn(org.apache.maven:maven-plugin-api)
 
 %description
 Compiler Assisted Localization, abbreviated as CAL10N (pronounced as "calion") 
@@ -42,77 +27,47 @@ Features:
 
 
 %package javadoc
-Group:          Documentation
-Summary:        Javadoc for %{name}
-Requires:       jpackage-utils
+Summary:        API documentation for %{name}
 
 %description javadoc
-API documentation for %{name}.
+%{summary}.
 
-%package -n maven-cal10n-plugin
-Summary:    CAL10N maven plugin
-Group:      Development/Tools
-Requires:   maven
-Requires:   %{name} = %{version}-%{release}
+%package -n maven-%{name}-plugin
+Summary:        CAL10N maven plugin
 
-%description -n maven-cal10n-plugin
+%description -n maven-%{name}-plugin
 Maven plugin verifying that the codes defined in
 an enum type match those in the corresponding resource bundles. 
 
 %prep
 %setup -q 
-find . -name "*.jar" | xargs rm
-%patch0
+find . -name \*.jar -delete
+%pom_add_dep org.apache.maven:maven-artifact maven-%{name}-plugin
+%pom_disable_module %{name}-site
+%pom_disable_module maven-%{name}-plugin-smoke
+%mvn_package :*-{plugin} @1
 
 %build
-mvn-rpmbuild -Dproject.build.sourceEncoding=ISO-8859-1 install javadoc:aggregate
+%mvn_build -- -Dproject.build.sourceEncoding=ISO-8859-1
 
 %install
+%mvn_install
 
-# jars
-install -d -m 0755 %{buildroot}%{_javadir}/%{name}
-install -m 644 cal10n-api/target/cal10n-api-%{version}.jar \
-        %{buildroot}%{_javadir}/%{name}/cal10n-api.jar
-install -m 644 maven-cal10n-plugin/target/maven-cal10n-plugin-%{version}.jar \
-        %{buildroot}%{_javadir}/%{name}/maven-cal10n-plugin.jar
-
-# poms
-install -d -m 755 %{buildroot}%{_mavenpomdir}
-install -pm 644 pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-parent.pom
-install -pm 644 cal10n-api/pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP.%{name}-%{name}-api.pom
-install -pm 644 maven-cal10n-plugin/pom.xml \
-    %{buildroot}%{_mavenpomdir}/JPP.%{name}-maven-cal10n-plugin.pom
-
-%add_maven_depmap JPP.%{name}-%{name}-parent.pom
-%add_maven_depmap JPP.%{name}-%{name}-api.pom %{name}/cal10n-api.jar
-%add_maven_depmap JPP.%{name}-maven-cal10n-plugin.pom %{name}/maven-cal10n-plugin.jar
-
-# javadoc
-install -d -m 0755 %{buildroot}%{_javadocdir}/%{name}
-cp -pr target/site/api*/* %{buildroot}%{_javadocdir}/%{name}
-
-
-
-%files
+%files -f .mfiles
 %dir %{_javadir}/%{name}
 %doc LICENSE.txt
-%{_javadir}/%{name}/%{name}*.jar
-%{_mavenpomdir}/JPP.%{name}-%{name}-parent*
-%{_mavenpomdir}/JPP.%{name}-%{name}-api*
-%{_mavendepmapfragdir}/%{name}
 
-%files -n maven-cal10n-plugin
-%doc LICENSE.txt
-%{_javadir}/%{name}/maven*.jar
-%{_mavenpomdir}/JPP.%{name}-maven*
+%files -n maven-%{name}-plugin -f .mfiles-plugin
 
-%files javadoc
+%files javadoc -f .mfiles-javadoc
 %doc LICENSE.txt
-%{_javadocdir}/%{name}
 
 %changelog
+* Fri Jun 14 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.7.7-2
+- Simplify BuildRequires
+- Convert patch to POM macro
+- Update to current packaging guidelines
+
 * Wed Mar 20 2013 Mikolaj Izdebski <mizdebsk@redhat.com> - 0.7.7-1
 - Update to upstream version 0.7.7