diff --git a/jakarta-commons-modeler.spec b/jakarta-commons-modeler.spec
index 59f3431..b4947ba 100644
--- a/jakarta-commons-modeler.spec
+++ b/jakarta-commons-modeler.spec
@@ -1,14 +1,9 @@
 %global short_name commons-modeler
 
-# enable OSGi automatic dep solving
-%define _use_internal_dependency_generator 0
-%define __find_provides /usr/lib/rpm/osgideps.pl -p
-%define __find_requires /usr/lib/rpm/osgideps.pl -r
-
 # TODO - Drop "jakarta-" from the package name
 Name:          jakarta-%{short_name}
 Version:       2.0.1
-Release:       2%{?dist}
+Release:       5%{?dist}
 Summary:       Model MBeans utility classes
 Group:         Development/Libraries/Java
 License:       ASL 2.0
@@ -24,13 +19,12 @@ BuildRoot:     %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:     noarch
 
-BuildRequires: java-devel
+BuildRequires: java-devel >= 1:1.6.0
 BuildRequires: jpackage-utils
 BuildRequires: jakarta-commons-beanutils >= 1.6
 BuildRequires: jakarta-commons-collections >= 2.1
 BuildRequires: jakarta-commons-digester >= 1.4.1
 BuildRequires: jakarta-commons-logging >= 1.0.4
-BuildRequires: mx4j >= 2.1.1
 BuildRequires: xml-commons-apis
 BuildRequires: maven2-plugin-antrun
 BuildRequires: maven2-plugin-assembly
@@ -50,7 +44,6 @@ Requires:      jakarta-commons-beanutils >= 1.6
 Requires:      jakarta-commons-collections >= 2.1
 Requires:      jakarta-commons-digester >= 1.4.1
 Requires:      jakarta-commons-logging >= 1.0.4
-Requires:      mx4j >= 2.1.1
 Requires:      xml-commons-apis
 
 Provides:      %{short_name} = %{version}-%{release}
@@ -79,21 +72,6 @@ cp -p %{SOURCE1} pom.xml
 export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
 mkdir -p $MAVEN_REPO_LOCAL
 
-# TODO: remove the hack below when 543686 is fixed
-mkdir -p $MAVEN_REPO_LOCAL/mx4j/mx4j-jmx/2.1.1
-pushd $MAVEN_REPO_LOCAL/mx4j/mx4j-jmx/2.1.1
-ln -s %{_javadir}/mx4j/mx4j-jmx.jar mx4j-jmx-2.1.1.jar
-cat <<HEREDOC > mx4j-jmx-2.1.1.pom
-<project>
-  <modelVersion>4.0.0</modelVersion>
-  <groupId>mx4j</groupId>
-  <artifactId>mx4j-jmx</artifactId>
-  <version>2.1.1</version>
-</project>
-HEREDOC
-popd
-# TODO: remove the hack above when 543686 is fixed
-
 # TODO: disable tests for now because they need internet access -- they run fine locally
 mvn-jpp -Dmaven.repo.local=$MAVEN_REPO_LOCAL -Dmaven.test.skip=true install javadoc:javadoc
 
@@ -137,6 +115,15 @@ rm -rf %{buildroot}
 %{_javadocdir}/%{name}
 
 %changelog
+* Wed Mar 3 2010 Mat Booth <fedora@matbooth.co.uk> - 2.0.1-5
+- Not ready yet for OSGi depsolving. See RHBZ #488352.
+
+* Tue Mar 2 2010 Alexander Kurtakov <akurtako@redhat.com> 2.0.1-4
+- BR java-devel 1.6.0.
+
+* Tue Mar 2 2010 Alexander Kurtakov <akurtako@redhat.com> 2.0.1-3
+- Remove all jmx/mx4j hacks. It is simply not needed - jmx is in the jdk since Java 5.
+
 * Tue Dec 8 2009 Mat Booth <fedora@matbooth.co.uk> - 2.0.1-2
 - Enable OSGi automatic depsolving (from Alphonse Van Assche).
 
diff --git a/pom.xml b/pom.xml
index a4523ec..3e4627a 100644
--- a/pom.xml
+++ b/pom.xml
@@ -93,13 +93,6 @@
     </dependency>
 
     <dependency>
-      <groupId>mx4j</groupId>
-      <artifactId>mx4j-jmx</artifactId>
-      <version>2.1.1</version>
-      <scope>provided</scope>
-    </dependency>
-
-    <dependency>
       <groupId>xml-apis</groupId>
       <artifactId>xml-apis</artifactId>
       <version>2.0.2</version>