diff --git a/libidn.spec b/libidn.spec
index 6abdd4e..a3efef9 100644
--- a/libidn.spec
+++ b/libidn.spec
@@ -1,7 +1,10 @@
 # Build with Emacs support
 %bcond_without libidn_enables_emacs
+
+%ifarch %{java_arches}
 # Build with Java support
 %bcond_without libidn_enables_java
+%endif
 
 Summary: Internationalized Domain Name support library
 Name: libidn
@@ -33,6 +36,11 @@ Obsoletes: emacs-libidn < 1.30-4
 Provides: emacs-libidn < 1.30-4
 Requires: emacs-filesystem >= %{_emacs_version}
 %endif
+%if %{without libidn_enables_java}
+# Remove old java packages on arches removed from %%java_arches
+Obsoletes: libidn-java < %{version}-%{release}
+Obsoletes: libidn-javadoc < %{version}-%{release}
+%endif
 
 %description
 GNU Libidn is an implementation of the Stringprep, Punycode and