diff --git a/javapackages-tools.changes b/javapackages-tools.changes
index 4ca9c18..e4f475c 100644
--- a/javapackages-tools.changes
+++ b/javapackages-tools.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 17 09:34:37 UTC 2015 - tchvatal@suse.com
+
+- Install macros to /etc/rpm as we do in SUSE:
+  * suse-macros-install-location.patch
+- Cleanup with spec-cleaner
+
 -------------------------------------------------------------------
 Fri Jan 23 20:59:04 UTC 2015 - mailaender@opensuse.org
 
diff --git a/javapackages-tools.spec b/javapackages-tools.spec
index 2651316..8799c7f 100644
--- a/javapackages-tools.spec
+++ b/javapackages-tools.spec
@@ -27,9 +27,9 @@ Source:         https://fedorahosted.org/released/javapackages/javapackages-%{ve
 #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
-#BuildArch:      noarch
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-
+#PATCH-FIX-SUSE: We put macros to /etc/rpm directly so make it reflected by
+#                the install script
+Patch1:         suse-macros-install-location.patch
 BuildRequires:  ant
 BuildRequires:  asciidoc
 BuildRequires:  dia
@@ -44,22 +44,22 @@ BuildRequires:  source-highlight
 BuildRequires:  xmlto
 BuildRequires:  xz
 BuildRequires:  pkgconfig(python)
-
 Requires:       coreutils
+Requires:       lua
+Requires:       python
+# for xml.dom.minidom
+Requires:       python-xml
+Provides:       jpackage-utils = %{version}-%{release}
+Provides:       jpackage-utils-java9
+Obsoletes:      jpackage-utils <= 1.7.5
+#BuildArch:      noarch
+BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 # for xsltproc
 %if 0%{?suse_version} == 1110
 Requires:       libxslt
 %else
 Requires:       libxslt-tools
 %endif
-Requires:       lua
-Requires:       python
-# for xml.dom.minidom
-Requires:       python-xml
-
-Provides:       jpackage-utils = %{version}-%{release}
-Provides:       jpackage-utils-java9
-Obsoletes:      jpackage-utils <= 1.7.5
 
 %description
 This package provides macros and scripts to support Java packaging.
@@ -110,9 +110,10 @@ This package provides non-essential macros and scripts to support Java packaging
 %prep
 %setup -q -n javapackages-%{version}
 %patch0 -p1
+%patch1 -p1
 
 %build
-%{configure} --rpmconfigdir=%{_sysconfdir}/rpm/
+%configure --rpmconfigdir=%{_sysconfdir}/rpm/
 ./build
 
 %install
@@ -129,7 +130,6 @@ rm -rf %{buildroot}%{_datadir}/fedora-review/
 %files -f files-common
 %defattr(-,root,root,-)
 %doc LICENSE
-%dir %{_sysconfdir}/rpm/macros.d
 
 %files -n javapackages-local -f files-local
 %defattr(-,root,root,-)
diff --git a/suse-macros-install-location.patch b/suse-macros-install-location.patch
new file mode 100644
index 0000000..32fff33
--- /dev/null
+++ b/suse-macros-install-location.patch
@@ -0,0 +1,24 @@
+Index: javapackages-4.4.0/install
+===================================================================
+--- javapackages-4.4.0.orig/install
++++ javapackages-4.4.0/install
+@@ -126,8 +126,8 @@ inst_exec java-utils/java-wrapper "${jav
+ inst_data java-utils/maven_depmap.py "${javadir}-utils"
+ inst_data java-utils/pom_editor.py "${javadir}-utils"
+ 
+-inst_data target/macros.jpackage "${rpmconfigdir}/macros.d"
+-inst_data target/macros.fjava "${rpmconfigdir}/macros.d"
++inst_data target/macros.jpackage "${rpmconfigdir}"
++inst_data target/macros.fjava "${rpmconfigdir}"
+ 
+ inst_data target/build-classpath.1 "${mandir}/man1"
+ inst_data target/build-jar-repository.1 "${mandir}/man1"
+@@ -174,7 +174,7 @@ link "${m2home}/configuration-rpmbuild-r
+ inst_config etc/javapackages-config.json "${javaconfdir}"
+ 
+ exec >files-local
+-inst_data target/macros.xmvn "${rpmconfigdir}/macros.d"
++inst_data target/macros.xmvn "${rpmconfigdir}"
+ 
+ inst_data java-utils/mvn_alias.py "${javadir}-utils"
+ inst_data java-utils/mvn_artifact.py "${javadir}-utils"