diff --git a/.gitignore b/.gitignore
index cd4f965..b7fee8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 /hibernate-commons-annotations-3.2.0.Final.tar.xz
 /hibernate-commons-annotations-4.0.1.Final.tar.xz
+/hibernate-commons-annotations-4.0.3.Final.tar.gz
diff --git a/New-logging-processor-version.patch b/New-logging-processor-version.patch
new file mode 100644
index 0000000..04ab74e
--- /dev/null
+++ b/New-logging-processor-version.patch
@@ -0,0 +1,203 @@
+From 8175ae30332ad8f8d6afdd93c093aca130b54ca6 Mon Sep 17 00:00:00 2001
+From: Tomaz Cerar <tomaz.cerar@gmail.com>
+Date: Mon, 9 Sep 2013 12:27:39 +0200
+Subject: [PATCH] Upgrade to latest logging processors and maven plugins.
+
+---
+ pom.xml                                            | 89 ++++++++--------------
+ .../annotations/common/util/impl/Log.java          |  8 +-
+ 2 files changed, 35 insertions(+), 62 deletions(-)
+
+diff --git a/pom.xml b/pom.xml
+index 980b9d2..f64a4d7 100644
+--- a/pom.xml
++++ b/pom.xml
+@@ -21,7 +21,8 @@
+   ~  51 Franklin Street, Fifth Floor
+   ~  Boston, MA  02110-1301  USA
+   -->
+-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
++<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
++         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ 
+     <modelVersion>4.0.0</modelVersion>
+ 
+@@ -103,8 +104,13 @@
+     </scm>
+ 
+     <properties>
+-        <jbossLoggingVersion>3.1.0.CR2</jbossLoggingVersion>
+-        <jbossLoggingProcessorVersion>1.0.0.CR5</jbossLoggingProcessorVersion>
++        <version.org.jboss.logging.jboss-logging>3.1.3.GA</version.org.jboss.logging.jboss-logging>
++        <version.org.jboss.logging.jboss-logging-tools>1.2.0.Beta1</version.org.jboss.logging.jboss-logging-tools>
++        <version.jar.plugin>2.4</version.jar.plugin>
++        <version.source.plugin>2.2.1</version.source.plugin>
++        <version.compiler.plugin>3.1</version.compiler.plugin>
++        <version.bundle.plugin>2.3.7</version.bundle.plugin>
++        <version.injection.plugin>1.0.2</version.injection.plugin>
+         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+     </properties>
+ 
+@@ -112,13 +118,26 @@
+         <dependency>
+             <groupId>org.jboss.logging</groupId>
+             <artifactId>jboss-logging</artifactId>
+-            <version>${jbossLoggingVersion}</version>
++            <version>${version.org.jboss.logging.jboss-logging}</version>
++        </dependency>
++        <dependency>
++            <groupId>org.jboss.logging</groupId>
++            <artifactId>jboss-logging-annotations</artifactId>
++            <version>${version.org.jboss.logging.jboss-logging-tools}</version>
++            <scope>provided</scope>
++        </dependency>
++
++        <dependency>
++            <groupId>org.jboss.logging</groupId>
++            <artifactId>jboss-logging-processor</artifactId>
++            <version>${version.org.jboss.logging.jboss-logging-tools}</version>
++            <scope>provided</scope>
+         </dependency>
+         <!-- test-scoped dependencies for common testing dependencies -->
+         <dependency>
+             <groupId>junit</groupId>
+             <artifactId>junit</artifactId>
+-            <version>3.8.1</version>
++            <version>4.11</version>
+             <scope>test</scope>
+         </dependency>
+         <!-- / test-scoped dependencies for common testing dependencies -->
+@@ -142,7 +161,7 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-source-plugin</artifactId>
+-                <version>2.1.2</version>
++                <version>${version.source.plugin}</version>
+                 <executions>
+                     <execution>
+                         <id>attach-sources</id>
+@@ -156,6 +175,7 @@
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-jar-plugin</artifactId>
++                <version>${version.jar.plugin}</version>
+                 <configuration>
+                     <archive>
+                         <manifestFile>${basedir}/target/classes/META-INF/MANIFEST.MF</manifestFile>
+@@ -191,10 +211,11 @@
+             <plugin>
+                 <groupId>org.apache.felix</groupId>
+                 <artifactId>maven-bundle-plugin</artifactId>
++                <version>${version.bundle.plugin}</version>
+                 <extensions>true</extensions>
+                 <configuration>
+                     <instructions>
+-                        <Bundle-SymbolicName>${pom.groupId}.${pom.artifactId}</Bundle-SymbolicName>
++                        <Bundle-SymbolicName>${project.groupId}.${project.artifactId}</Bundle-SymbolicName>
+                         <Bundle-Name>${project.name}</Bundle-Name>
+                         <Bundle-Version>${project.version}</Bundle-Version>
+                         <Export-Package>
+@@ -215,7 +236,7 @@
+             <plugin>
+                 <groupId>org.jboss.maven.plugins</groupId>
+                 <artifactId>maven-injection-plugin</artifactId>
+-                <version>1.0.2</version>
++                <version>${version.injection.plugin}</version>
+                 <executions>
+                     <execution>
+                         <phase>compile</phase>
+@@ -240,62 +261,14 @@
+             </plugin>
+             <plugin>
+                 <groupId>org.apache.maven.plugins</groupId>
+-                <artifactId>maven-jar-plugin</artifactId>
+-                <version>2.3.1</version>
+-            </plugin>
+-            <plugin>
+-                <groupId>org.apache.maven.plugins</groupId>
+                 <artifactId>maven-compiler-plugin</artifactId>
+-                <version>2.3.2</version>
++                <version>${version.compiler.plugin}</version>
+                 <configuration>
+                     <source>1.6</source>
+                     <target>1.6</target>
+                     <encoding>UTF-8</encoding>
+                 </configuration>
+             </plugin>
+-            <plugin>
+-                <groupId>org.bsc.maven</groupId>
+-                <artifactId>maven-processor-plugin</artifactId>
+-                <version>2.0.2</version>
+-                <executions>
+-                    <!-- Run annotation processors on src/main/java sources -->
+-                    <execution>
+-                        <id>process</id>
+-                        <goals>
+-                            <goal>process</goal>
+-                        </goals>
+-                        <phase>generate-sources</phase>
+-                        <configuration>
+-                            <compilerArguments>-AloggingVersion=3.0 -AtranslationFilesPath=${project.basedir}/src/main/resources/ -source 1.6 -target 1.6</compilerArguments>
+-                            <processors>
+-                                <processor>org.jboss.logging.generator.apt.LoggingToolsProcessor</processor>
+-                            </processors>
+-                        </configuration>
+-                    </execution>
+-                    <!-- Run annotation processors on src/test/java sources -->
+-                    <execution>
+-                        <id>process-test</id>
+-                        <goals>
+-                            <goal>process-test</goal>
+-                        </goals>
+-                        <phase>generate-test-sources</phase>
+-                        <configuration>
+-                            <compilerArguments>-AloggingVersion=3.0 -AtranslationFilesPath=${project.basedir}/src/main/resources/ -source 1.6 -target 1.6</compilerArguments>
+-                            <processors>
+-                                <processor>org.jboss.logging.generator.apt.LoggingToolsProcessor</processor>
+-                            </processors>
+-                        </configuration>
+-                    </execution>
+-                </executions>
+-                <dependencies>
+-                    <dependency>
+-                        <groupId>org.jboss.logging</groupId>
+-                        <artifactId>jboss-logging-processor</artifactId>
+-                        <version>${jbossLoggingProcessorVersion}</version>
+-                        <scope>compile</scope>
+-                    </dependency>
+-                </dependencies>
+-            </plugin>
+         </plugins>
+         <pluginManagement>
+             <plugins>
+@@ -323,7 +296,7 @@
+                                         </goals>
+                                     </pluginExecutionFilter>
+                                     <action>
+-                                        <ignore />
++                                        <ignore/>
+                                     </action>
+                                 </pluginExecution>
+                             </pluginExecutions>
+diff --git a/src/main/java/org/hibernate/annotations/common/util/impl/Log.java b/src/main/java/org/hibernate/annotations/common/util/impl/Log.java
+index 0c24cbf..2e79de9 100644
+--- a/src/main/java/org/hibernate/annotations/common/util/impl/Log.java
++++ b/src/main/java/org/hibernate/annotations/common/util/impl/Log.java
+@@ -21,10 +21,10 @@
+ package org.hibernate.annotations.common.util.impl;
+ 
+ import org.jboss.logging.BasicLogger;
+-import org.jboss.logging.Cause;
+-import org.jboss.logging.LogMessage;
+-import org.jboss.logging.Message;
+-import org.jboss.logging.MessageLogger;
++import org.jboss.logging.annotations.Cause;
++import org.jboss.logging.annotations.LogMessage;
++import org.jboss.logging.annotations.Message;
++import org.jboss.logging.annotations.MessageLogger;
+ 
+ import static org.jboss.logging.Logger.Level.*;
+ 
+-- 
+1.8.4
+
diff --git a/hibernate-commons-annotations-4.0.1.Final-pom.patch b/hibernate-commons-annotations-4.0.1.Final-pom.patch
deleted file mode 100644
index ba6f5f0..0000000
--- a/hibernate-commons-annotations-4.0.1.Final-pom.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- pom.xml	2011-11-29 18:16:49.000000000 +0100
-+++ pom.xml-gil	2012-02-29 21:34:00.348848176 +0100
-@@ -245,7 +245,7 @@
-                         <configuration>
-                             <compilerArguments>-AloggingVersion=3.0 -AtranslationFilesPath=${project.basedir}/src/main/resources/ -source 1.6 -target 1.6</compilerArguments>
-                             <processors>
--                                <processor>org.jboss.logging.generator.apt.LoggingToolsProcessor</processor>
-+                                <processor>org.jboss.logging.processor.apt.LoggingToolsProcessor</processor>
-                             </processors>
-                         </configuration>
-                     </execution>
-@@ -259,7 +259,7 @@
-                         <configuration>
-                             <compilerArguments>-AloggingVersion=3.0 -AtranslationFilesPath=${project.basedir}/src/main/resources/ -source 1.6 -target 1.6</compilerArguments>
-                             <processors>
--                                <processor>org.jboss.logging.generator.apt.LoggingToolsProcessor</processor>
-+                                <processor>org.jboss.logging.processor.apt.LoggingToolsProcessor</processor>
-                             </processors>
-                         </configuration>
-                     </execution>
diff --git a/hibernate-commons-annotations.spec b/hibernate-commons-annotations.spec
index 96e2b7b..8d6b4a0 100644
--- a/hibernate-commons-annotations.spec
+++ b/hibernate-commons-annotations.spec
@@ -2,42 +2,30 @@
 %global namedversion %{version}%{?namedreltag}
 
 Name:             hibernate-commons-annotations
-Version:          4.0.1
-Release:          5%{?dist}
+Version:          4.0.3
+Release:          1%{?dist}
 Summary:          Hibernate Annotations
 
-Group:            Development/Libraries
-
 # For details see:
 # - https://github.com/hibernate/hibernate-commons-annotations/commit/4a902b4f97f923f9044a4127357b44fe5dc39cdc
 # - https://github.com/hibernate/hibernate-commons-annotations/commit/a11c44cd65dadcedaf8981379b94a2c4e31428d1
 License:          LGPLv2
 URL:              http://www.hibernate.org/
+Source0:          https://github.com/hibernate/hibernate-commons-annotations/archive/hibernate-commons-annotations-%{namedversion}.tar.gz
 
-# git clone git://github.com/hibernate/hibernate-commons-annotations.git
-# cd hibernate-commons-annotations && git archive --format=tar --prefix=hibernate-commons-annotations-4.0.1.Final/ 4.0.1.Final | xz > hibernate-commons-annotations-4.0.1.Final.tar.xz
-Source0:          %{name}-%{namedversion}.tar.xz
-# corrects the position of the class LoggingToolsProcessor for the new jboss-logging-tools
-Patch0:           hibernate-commons-annotations-4.0.1.Final-pom.patch
-BuildArch:        noarch
+# Support for new jboss-logging-tools
+Patch0:           New-logging-processor-version.patch
 
-Requires:         java
-Requires:         jboss-logging
-Requires:         slf4j
-Requires:         jpackage-utils
+BuildArch:        noarch
 
 BuildRequires:    jboss-logging
-
-BuildRequires:    jboss-logging-tools
+BuildRequires:    jboss-logging-tools >= 1.2.0
 BuildRequires:    junit
 BuildRequires:    slf4j
 BuildRequires:    apache-commons-logging
 BuildRequires:    jpackage-utils
-BuildRequires:    java-devel
 BuildRequires:    maven-local
-
 BuildRequires:    maven-processor-plugin
-
 BuildRequires:    maven-compiler-plugin
 BuildRequires:    maven-injection-plugin
 BuildRequires:    maven-install-plugin
@@ -59,42 +47,31 @@ Common reflection code used in support of annotation processing.
 
 %package javadoc
 Summary:        Javadocs for %{name}
-Group:          Documentation
-Requires:       jpackage-utils
 
 %description javadoc
 This package contains the API documentation for %{name}.
 
 %prep
-%setup -q -n %{name}-%{namedversion}
-%patch0 -p0
+%setup -q -n hibernate-commons-annotations-hibernate-commons-annotations-%{namedversion}
+%patch0 -p1
 
 %build
-mvn-rpmbuild install javadoc:aggregate
+%mvn_build
 
 %install
+%mvn_install
 
-mkdir -p $RPM_BUILD_ROOT%{_javadir}/hibernate
-cp -p target/%{name}-%{namedversion}.jar $RPM_BUILD_ROOT%{_javadir}/hibernate/%{name}.jar
-
-mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -rp  target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-
-install -d -m 755 $RPM_BUILD_ROOT%{_mavenpomdir}
-install -pm 644 pom.xml $RPM_BUILD_ROOT%{_mavenpomdir}/JPP.hibernate-%{name}.pom
-%add_maven_depmap JPP.hibernate-%{name}.pom hibernate/%{name}.jar -a "org.hibernate:%{name}"
-
-%files
-%{_mavenpomdir}/*
-%{_mavendepmapfragdir}/*
-%{_javadir}/*
+%files -f .mfiles
+%dir %{_javadir}/%{name}
 %doc changelog.txt lgpl.txt readme.txt
 
-%files javadoc
-%{_javadocdir}/%{name}
+%files javadoc -f .mfiles-javadoc
 %doc lgpl.txt
 
 %changelog
+* Mon Sep 09 2013 Marek Goldmann <mgoldman@redhat.com> - 4.0.3-1
+- Upstream release 4.0.3.Final
+
 * Sat Aug 03 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 4.0.1-5
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
 
diff --git a/sources b/sources
index 67dfd22..8403999 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-e5886c6ce2eccb45345d82ddeeecd27c  hibernate-commons-annotations-4.0.1.Final.tar.xz
+71c4a333270cb5369f1470d3e47d83d9  hibernate-commons-annotations-4.0.3.Final.tar.gz