diff --git a/gcc.changes b/gcc.changes
index 6a3ee49..0ce9284 100644
--- a/gcc.changes
+++ b/gcc.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Oct  4 18:21:01 UTC 2012 - dmueller@suse.com
+
+- remove gcc-ada subpackage for those architectures that
+  don't have a gccXX-ada package
+
 -------------------------------------------------------------------
 Wed Apr 18 11:26:15 UTC 2012 - rguenther@suse.com
 
diff --git a/gcc.spec b/gcc.spec
index 043fc2b..96d1b14 100644
--- a/gcc.spec
+++ b/gcc.spec
@@ -25,6 +25,15 @@ Name:           gcc
 %ifarch x86_64 s390x ppc64
 %define separate_bi32 1
 %endif
+# Ada currently fails to build on a few platforms, enable it only
+# on those that work
+# Note that AdaCore only supports %ix86, x86_64 and ia64
+%ifarch %ix86 x86_64 ppc s390 ia64
+%define build_ada 1
+%else
+# alpha ppc64 s390x hppa arm
+%define build_ada 0
+%endif
 Url:            http://gcc.gnu.org/
 %define gcc_version 47
 %define gcc_suffix 4.7
@@ -302,7 +311,7 @@ Requires:       gcc-objc = %{version}
 The system GNU Objective C++ Compiler.
 
 
-
+%if %{build_ada}
 %package -n gcc-ada
 Summary:        The system GNU Ada Compiler
 License:        GPL-3.0+
@@ -312,7 +321,7 @@ Requires:       gcc%{gcc_version}-ada
 
 %description -n gcc-ada
 The system GNU Ada Compiler.
-
+%endif
 
 %package -n gcc-z9
 Summary:        The system GNU C Compiler
@@ -354,8 +363,10 @@ for program in \
 	gij64 \
 %endif
         gfortran \
+%if %{build_ada}
 	gnat gnatbind gnatbl gnatchop gnatclean gnatfind gnatkr \
 	gnatlink gnatls gnatmake gnatname gnatprep gnatxref gprmake \
+%endif
     ; do
   ln -sf $program-%{gcc_suffix} $RPM_BUILD_ROOT%{_prefix}/bin/$program
 done
@@ -482,6 +493,7 @@ EOF
 # empty - only for the dependency
 %doc README
 
+%if %{build_ada}
 %files -n gcc-ada
 %defattr(-,root,root)
 %{_prefix}/bin/gnat
@@ -498,6 +510,7 @@ EOF
 %{_prefix}/bin/gnatprep
 %{_prefix}/bin/gnatxref
 %{_prefix}/bin/gprmake
+%endif
 
 %files -n libstdc++-devel
 %defattr(-,root,root)