diff --git a/checkstyle.spec b/checkstyle.spec
index 73c7369..65c1773 100644
--- a/checkstyle.spec
+++ b/checkstyle.spec
@@ -30,7 +30,7 @@
 
 Name:           checkstyle
 Version:        5.3
-Release:        2%{?dist}
+Release:        3%{?dist}
 Summary:        Java source code checker
 URL:            http://checkstyle.sourceforge.net/
 # src/checkstyle/com/puppycrawl/tools/checkstyle/grammars/java.g is GPLv2+
@@ -102,7 +102,7 @@ A tool for checking Java source code for adherence to a set of rules.
 %package        demo
 Group:          Development/Tools
 Summary:        Demos for %{name}
-Requires:       %{name} = %{epoch}:%{version}
+Requires:       %{name} = %{version}-%{release}
 
 %description    demo
 Demonstrations and samples for %{name}.
@@ -173,7 +173,7 @@ cp -par contrib/* %{buildroot}%{_datadir}/%{name}
 # ant.d
 install -dm 755  %{buildroot}%{_sysconfdir}/ant.d
 cat > %{buildroot}%{_sysconfdir}/ant.d/%{name} << EOF
-checkstyle antlr regexp jakarta-commons-beanutils jakarta-commons-cli jakarta-commons-logging jakarta-commons-collections jaxp_parser_impl
+checkstyle antlr regexp apache-commons-beanutils apache-commons-cli apache-commons-logging apache-commons-collections jaxp_parser_impl
 EOF
 
 %clean
@@ -220,6 +220,10 @@ fi
 
 
 %changelog
+* Thu Apr 28 2011 Stanislav Ochotnicky <sochotnicky@redhat.com> - 5.3-3
+- Remove epoch from demo subpackage
+- Fix script classpaths after jakarta->apache renames
+
 * Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 5.3-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild