diff --git a/.gitignore b/.gitignore
index 0926470..2616b87 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 checkstyle-src-4.1.tar.gz
 checkstyle-src-5.1.tar.gz
 /checkstyle-5.3-src.tar.gz
+/checkstyle-5.4-src.tar.gz
diff --git a/0001-Remove-sonatype-parent.patch b/0001-Remove-sonatype-parent.patch
index cf9a227..fd4f354 100644
--- a/0001-Remove-sonatype-parent.patch
+++ b/0001-Remove-sonatype-parent.patch
@@ -1,6 +1,6 @@
-From ce9c855bc485bb1df802b753e5443deddcd740d5 Mon Sep 17 00:00:00 2001
+From 90722ab9aa29d47ba5afe6c54183f979365eaa3e Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Thu, 21 Oct 2010 14:59:43 +0200
+Date: Wed, 20 Jul 2011 10:03:20 +0200
 Subject: [PATCH 1/2] Remove sonatype parent
 
 ---
@@ -8,12 +8,12 @@ Subject: [PATCH 1/2] Remove sonatype parent
  1 files changed, 0 insertions(+), 7 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index f54cd34..6d4ae4c 100644
+index 35d2248..a7ac3a2 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -2,13 +2,6 @@
- 
- <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">
+@@ -12,13 +12,6 @@
+         updates available.
+   -->
  
 -  <!-- Used for making releases. -->
 -  <parent>
@@ -26,5 +26,5 @@ index f54cd34..6d4ae4c 100644
    <groupId>com.puppycrawl.tools</groupId>
    <artifactId>checkstyle</artifactId>
 -- 
-1.7.2.3
+1.7.6
 
diff --git a/0002-Remove-linkcheck-plugin.patch b/0002-Remove-linkcheck-plugin.patch
index 2fcccda..a5a11e4 100644
--- a/0002-Remove-linkcheck-plugin.patch
+++ b/0002-Remove-linkcheck-plugin.patch
@@ -1,27 +1,29 @@
-From 283e474e39adab99e3c7c88455bd4723b65c5e38 Mon Sep 17 00:00:00 2001
+From 4efff973ae71aaab10d0fccc7fa8abe674f2c2a1 Mon Sep 17 00:00:00 2001
 From: Stanislav Ochotnicky <sochotnicky@redhat.com>
-Date: Thu, 21 Oct 2010 15:10:47 +0200
+Date: Wed, 20 Jul 2011 10:04:37 +0200
 Subject: [PATCH 2/2] Remove linkcheck plugin
 
 ---
- pom.xml |    4 ----
- 1 files changed, 0 insertions(+), 4 deletions(-)
+ pom.xml |    6 ------
+ 1 files changed, 0 insertions(+), 6 deletions(-)
 
 diff --git a/pom.xml b/pom.xml
-index 6d4ae4c..6ebda69 100644
+index a7ac3a2..59f6e35 100644
 --- a/pom.xml
 +++ b/pom.xml
-@@ -347,10 +347,6 @@
+@@ -367,12 +367,6 @@
        </plugin>
  
        <plugin>
 -        <groupId>org.apache.maven.plugins</groupId>
 -        <artifactId>maven-linkcheck-plugin</artifactId>
+-        <version>1.1</version>
 -      </plugin>
+-
 -      <plugin>
        	<groupId>org.apache.maven.plugins</groupId>
        	<artifactId>maven-eclipse-plugin</artifactId>
-         <configuration>
+         <version>2.8</version>
 -- 
-1.7.2.3
+1.7.6
 
diff --git a/checkstyle.spec b/checkstyle.spec
index c10460d..d59a955 100644
--- a/checkstyle.spec
+++ b/checkstyle.spec
@@ -29,8 +29,8 @@
 #
 
 Name:           checkstyle
-Version:        5.3
-Release:        4%{?dist}
+Version:        5.4
+Release:        1%{?dist}
 Summary:        Java source code checker
 URL:            http://checkstyle.sourceforge.net/
 # src/checkstyle/com/puppycrawl/tools/checkstyle/grammars/java.g is GPLv2+
@@ -200,6 +200,9 @@ fi
 
 
 %changelog
+* Wed Jul 20 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 5.4-1
+- Update to latest upstream (5.4)
+
 * Fri Jul  1 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 5.3-4
 - Generate script using jpackage macro (#718039)
 - Add missing guava Requires
diff --git a/sources b/sources
index f60f30b..51e8b35 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-9a19c903536e3627de87f611b73c1639  checkstyle-5.3-src.tar.gz
+eddecbd2c609d4857a88b03d9d9d2a6e  checkstyle-5.4-src.tar.gz