diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index c2709cc..660ae59 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -5,6 +5,7 @@ Wed Oct 24 08:19:24 UTC 2018 - Fridrich Strba <fstrba@suse.com>
 - Modified patch:
   * suse-no-epoch.patch
     + rediff to changed code
+- Build the :extras flavour as noarch
 
 -------------------------------------------------------------------
 Wed Oct 24 07:53:45 UTC 2018 - Fridrich Strba <fstrba@suse.com>
@@ -13,6 +14,7 @@ Wed Oct 24 07:53:45 UTC 2018 - Fridrich Strba <fstrba@suse.com>
   * suse-no-epoch.patch
     + we did not bump epoch of OpenJDK packages in SUSE
     + fix a potential generation of unresolvable requires
+    + adapt the tests to not expect the epoch
 
 -------------------------------------------------------------------
 Tue Jul 24 14:09:47 UTC 2018 - tchvatal@suse.com
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 8d8d82b..330cb81 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -33,9 +33,7 @@ Summary:        Macros and scripts for Java packaging support
 License:        BSD-3-Clause
 Group:          Development/Languages/Java
 URL:            https://github.com/fedora-java/javapackages
-# Latest tag is missing, quite often needs patches, use service
 Source0:        https://github.com/fedora-java/javapackages/archive/%{version}.tar.gz
-
 #PATCH-FIX-SUSE: SUSE does store jvm related things in libdir - ie /usr/lib64 on 64bits
 #                where Fedora use jpackage convention - usr/lib everywhere
 Patch0:         suse-use-libdir.patch
@@ -48,6 +46,7 @@ BuildRequires:  asciidoc
 BuildRequires:  fdupes
 BuildRequires:  rpm
 BuildRequires:  xmlto
+Requires:       javapackages-filesystem = %{version}-%{release}
 # Used on too many places
 Provides:       jpackage-utils = %{version}
 Obsoletes:      %{name}-doc
@@ -57,11 +56,20 @@ BuildRequires:  python3-lxml
 BuildRequires:  python3-nose
 BuildRequires:  python3-setuptools
 BuildRequires:  python3-six
+BuildArch:      noarch
 %endif
 
 %description
 This package provides macros and scripts to support Java packaging.
 
+%package -n javapackages-filesystem
+Summary:        Java packages filesystem layout
+Group:          Development/Languages/Java
+
+%description -n javapackages-filesystem
+This package provides some basic directories into which Java packages
+install their content.
+
 %if %{with python}
 %package -n maven-local
 Summary:        Macros and scripts for Maven packaging support
@@ -172,9 +180,6 @@ files="
 for i in $files; do
     rm -rf %{buildroot}/$i
 done
-%else
-# we want this in the basic package always
-cat files-filesystem >> files-tools
 %endif
 
 rm -rf %{buildroot}%{_datadir}/fedora-review/
@@ -187,7 +192,9 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
 %if !%{with python}
 %files -f files-tools
 %license LICENSE
-%dir %{_datadir}/maven-metadata
+
+%files -n javapackages-filesystem -f files-filesystem
+
 %else
 %files -n javapackages-local -f files-local
 %dir %{_datadir}/java-utils