diff --git a/drbd.spec b/drbd.spec
index 7fc5720..71b6ebd 100644
--- a/drbd.spec
+++ b/drbd.spec
@@ -3,20 +3,25 @@
 # autoconf...
 %{!?_initddir: %{expand: %%global _initddir %{_initrddir}}}
 
-# Conditionals -- invoke "rpmbuild --without <feature>" to disable
-# specific features
-# note: conditionals may not contain "-" nor "_", hence "bashcompletion"
-%bcond_without xen
+# Conditionals
+# Invoke "rpmbuild --without <feature>" or "rpmbuild --with <feature>"
+# to disable or enable specific features
 %bcond_without udev
 %bcond_without pacemaker
 %bcond_with rgmanager
 %bcond_without heartbeat
+# conditionals may not contain "-" nor "_", hence "bashcompletion"
 %bcond_without bashcompletion
+# --with xen is ignored on any non-x86 architecture
+%bcond_without xen
+%ifnarch %{ix86} x86_64
+%global _without_xen --without-xen
+%endif
 
 Name: drbd
 Summary: DRBD driver for Linux
 Version: 8.3.6
-Release: 1%{?dist}
+Release: 2%{?dist}
 Source: http://oss.linbit.com/%{name}/8.3/%{name}-%{version}.tar.gz
 License: GPLv2+
 ExclusiveOS: linux
@@ -28,9 +33,11 @@ BuildRequires: flex
 BuildRequires: udev
 %endif
 Requires: %{name}-utils = %{version}
+%ifarch %{ix86} x86_64
 %if %{with xen}
 Requires: %{name}-xen = %{version}
 %endif
+%endif
 %if %{with pacemaker}
 Requires: %{name}-pacemaker = %{version}
 %endif
@@ -107,6 +114,7 @@ This packages includes the DRBD administration tools.
 %doc ChangeLog
 %doc README
 
+%ifarch %{ix86} x86_64
 %if %{with xen}
 %package xen
 Summary: Xen block device management script for DRBD
@@ -122,6 +130,7 @@ promoting and demoting DRBD resources as necessary.
 %defattr(755,root,root,-)
 %{_sysconfdir}/xen/scripts/block-drbd
 %endif # with xen
+%endif # arch %{ix86} x86_64
 
 %if %{with udev}
 %package udev
@@ -267,6 +276,9 @@ fi
 
 
 %changelog
+* Thu Nov  8 2009 Philipp Reisner <phil@linbit.com> - 8.3.6-2
+- Do not build the drbd-xen package on non x86 architectures.
+
 * Thu Nov  8 2009 Philipp Reisner <phil@linbit.com> - 8.3.6-1
 - New upstream release.