diff --git a/paraview.spec b/paraview.spec
index a9f644b..caaf216 100644
--- a/paraview.spec
+++ b/paraview.spec
@@ -130,22 +130,6 @@ Install the paraview-mpich2 package to get a version compiled with mpich2.
 %endif
 
 
-%if %{build_openmpi}
-%package        openmpi
-Summary:        Parallel visualization application
-Group:          Applications/Engineering
-Requires:       %{name}-data = %{version}-%{release}
-Requires:       openmpi
-Obsoletes:      %{name}-mpi < %{version}-%{release}
-Provides:       %{name}-mpi = %{version}-%{release}
-
-%description    openmpi
-This package contains copies of the ParaView server binaries compiled with
-OpenMPI.  These are named pvserver_openmpi, pvbatch_openmpi, etc.
-
-You will need to load the openmpi-%{_arch} module to setup your path properly.
-
-
 %package        data
 Summary:        Data files for ParaView
 Group:          Applications/Engineering
@@ -180,7 +164,22 @@ BuildArch:      noarch
 %{summary}.
 
 
-%prep
+%if %{build_openmpi}
+%package        openmpi
+Summary:        Parallel visualization application
+Group:          Applications/Engineering
+Requires:       %{name}-data = %{version}-%{release}
+Requires:       openmpi
+Obsoletes:      %{name}-mpi < %{version}-%{release}
+Provides:       %{name}-mpi = %{version}-%{release}
+
+%description    openmpi
+This package contains copies of the ParaView server binaries compiled with
+OpenMPI.  These are named pvserver_openmpi, pvbatch_openmpi, etc.
+
+You will need to load the openmpi-%{_arch} module to setup your path properly.
+
+
 %package        openmpi-devel
 Summary:        Development files for %{name}-openmpi
 Group:          Development/Libraries
@@ -216,6 +215,7 @@ developing applications that use %{name}-mpich2.
 %endif
 
 
+%prep
 %setup -q -n ParaView-%{version}%{?rcver}
 %patch1 -p1 -b .include
 %patch7 -p1 -b .hdf5