diff --git a/jvmfwk/Module_jvmfwk.mk b/jvmfwk/Module_jvmfwk.mk
index dba94da68de5..a6131da1f1ca 100644
--- a/jvmfwk/Module_jvmfwk.mk
+++ b/jvmfwk/Module_jvmfwk.mk
@@ -30,11 +30,11 @@ $(eval $(call gb_Module_Module,jvmfwk))
 ifneq ($(SOLAR_JAVA),)
 
 $(eval $(call gb_Module_add_targets,jvmfwk,\
-    JavaClassSet_jreproperties \
     Library_jvmfwk \
     Library_sunjavaplugin \
     Package_inc \
     Package_javavendors \
+    Package_jreproperties \
     Package_rcfiles \
 ))
 
diff --git a/jvmfwk/Package_jreproperties.mk b/jvmfwk/Package_jreproperties.mk
new file mode 100644
index 000000000000..4e35e7ea6c92
--- /dev/null
+++ b/jvmfwk/Package_jreproperties.mk
@@ -0,0 +1,39 @@
+# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
+# Version: MPL 1.1 / GPLv3+ / LGPLv3+
+#
+# The contents of this file are subject to the Mozilla Public License Version
+# 1.1 (the "License"); you may not use this file except in compliance with
+# the License or as specified alternatively below. You may obtain a copy of
+# the License at http://www.mozilla.org/MPL/
+#
+# Software distributed under the License is distributed on an "AS IS" basis,
+# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+# for the specific language governing rights and limitations under the
+# License.
+#
+# Major Contributor(s):
+# Copyright (C) 2010 Red Hat, Inc., David Tardon <dtardon@redhat.com>
+#  (initial developer)
+#
+# All Rights Reserved.
+#
+# For minor contributions see the git repository.
+#
+# Alternatively, the contents of this file may be used under the terms of
+# either the GNU General Public License Version 3 or later (the "GPLv3+"), or
+# the GNU Lesser General Public License Version 3 or later (the "LGPLv3+"),
+# in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
+# instead of those above.
+
+$(eval $(call gb_Package_Package,jvmfwk_jreproperties,$(WORKDIR)/CustomTarget/jvmfwk/plugins/sunmajor/pluginlib))
+
+$(eval $(call gb_Package_add_customtarget,jvmfwk_jreproperties,jvmfwk/plugins/sunmajor/pluginlib))
+
+$(eval $(call gb_CustomTarget_add_dependencies,jvmfwk/plugins/sunmajor/pluginlib,\
+    jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
+))
+
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,bin/JREProperties.class,JREProperties.class))
+$(eval $(call gb_Package_add_file,jvmfwk_jreproperties,lib/JREProperties.class,JREProperties.class))
+
+# vim:set shiftwidth=4 softtabstop=4 expandtab:
diff --git a/jvmfwk/JavaClassSet_jreproperties.mk b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
similarity index 79%
rename from jvmfwk/JavaClassSet_jreproperties.mk
rename to jvmfwk/plugins/sunmajor/pluginlib/Makefile
index 14484084bacd..2e91b1d95f81 100644
--- a/jvmfwk/JavaClassSet_jreproperties.mk
+++ b/jvmfwk/plugins/sunmajor/pluginlib/Makefile
@@ -25,10 +25,13 @@
 # in which case the provisions of the GPLv3+ or the LGPLv3+ are applicable
 # instead of those above.
 
-$(eval $(call gb_JavaClassSet_JavaClassSet,jvmfwk_jreproperties))
+include $(GBUILDDIR)/gbuild.mk
 
-$(eval $(call gb_JavaClassSet_add_sourcefiles,jvmfwk_jreproperties,\
-    jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java \
-))
+JREProperties.class : $(SRCDIR)/jvmfwk/plugins/sunmajor/pluginlib/JREProperties.java
+	$(gb_JavaClassSet_JAVACCOMMAND) $(gb_JavaClassSet_JAVACDEBUG) -d $(dir $@) $^
 
-# vim:set shiftwidth=4 softtabstop=4 expandtab:
+.DEFAULT_GOAL := all
+.PHONY : all
+all : JREProperties.class
+
+# vim:set shiftwidth=4 tabstop=4 noexpandtab: