diff --git a/devel-inc.txt b/devel-inc.txt
index c67e900..054d580 100644
--- a/devel-inc.txt
+++ b/devel-inc.txt
@@ -1,8 +1,11 @@
 Requires:       mpich-gnu-hpc-devel
 Requires:       mpich-ofi-gnu-hpc-devel
 Requires:       mvapich2-gnu-hpc-devel
-Requires:       mvapich2-psm2-gnu-hpc-devel
 Requires:       openmpi2-gnu-hpc-devel
+%ifarch x86_64
+Recommends:     mvapich2-psm2-gnu-hpc-devel
+Recommends:     mvapich2-psm2-gnu-hpc-doc
+%endif
 Recommends:     gsl_serial-devel
 Recommends:     metis_serial-devel
 Recommends:     python3-numpy-devel
@@ -19,22 +22,19 @@ Recommends:     netcdf-gnu-hpc-devel
 Recommends:     netcdf-gnu-mpich-hpc-devel
 Recommends:     netcdf-gnu-mvapich2-hpc-devel
 Recommends:     netcdf-gnu-openmpi2-hpc-devel
-Recommends:     netcdf-gnu-fortran-gnu-gnu-mpic
 Recommends:     libopenblas-gnu-hpc-devel
 Recommends:     libopenblas-pthreads-gnu-hpc-devel
 Recommends:     libblacs2-gnu-mpich-hpc-devel
 Recommends:     libblacs2-gnu-mvapich2-hpc-devel
 Recommends:     libblacs2-gnu-openmpi2-hpc-devel
-Recommends:     libnetcdf-gnu-mvapich2-hpc-devel
+Recommends:     libnetcdf-cxx4-gnu-hpc-devel
 Recommends:     petsc-gnu-mpich-hpc-devel
 Recommends:     petsc-gnu-mvapich2-hpc-devel
 Recommends:     petsc-gnu-openmpi2-hpc-devel
+Recommends:     petsc-doc
 Recommends:     libscalapack2-gnu-mpich-hpc-devel
 Recommends:     libscalapack2-gnu-mvapich2-hpc-devel
 Recommends:     libscalapack2-gnu-openmpi2-hpc-devel
-Recommends:     tau-gnu-mvapich2-hpc-devel
-Recommends:     tau-gnu-openmpi2-hpc-devel
-Recommends:     mvapich2-psm-gnu-hpc-devel
 Recommends:     python3-numpy-gnu-hpc-devel
 Recommends:     mpiP-gnu-mpich-hpc
 Recommends:     mpiP-gnu-mvapich2-hpc
@@ -43,7 +43,4 @@ Recommends:     mpiP-gnu-openmpi2-hpc
 Recommends:     lua-lmod-doc
 Recommends:     hwloc-doc
 Recommends:     luaposix-doc
-Recommends:     petsc-doc
 Recommends:     mvapich2-gnu-hpc-doc
-Recommends:     mvapich2-psm-gnu-hpc-doc
-Recommends:     mvapich2-psm2-gnu-hpc-doc
diff --git a/library-inc.txt b/library-inc.txt
index e5201f8..c6f436a 100644
--- a/library-inc.txt
+++ b/library-inc.txt
@@ -5,7 +5,6 @@ Recommends:     python3-numpy
 Recommends:     superlu-gnu
 Recommends:     libfftw3-gnu-hpc
 Recommends:     libhdf5-gnu-hpc
-Recommends:     libhdf5hl_fortran100-hpc
 Recommends:     libhdf5_cpp-gnu-hpc
 Recommends:     libhdf5_fortran-gnu-hpc
 Recommends:     libhdf5_hl-gnu-hpc
@@ -17,8 +16,12 @@ Recommends:     libopenblas-pthreads-gnu-hpc
 Requires:       mpich-gnu-hpc
 Requires:       mpich-ofi-gnu-hpc
 Requires:       mvapich2-gnu-hpc
-Requires:       mvapich2-psm2-gnu-hpc
 Requires:       openmpi2-gnu-hpc
+# Just have this two transport on x86_64, to besure to breack anything
+# only recommend them
+%ifarch x86_64
+Recommends:     mvapich2-psm2-gnu-hpc
+%endif
 # Now the mpi dependend recommends
 Recommends:     libblacs2-gnu-mpich-hpc
 Recommends:     libblacs2-gnu-mvapich2-hpc
@@ -51,10 +54,7 @@ Recommends:     libpetsc-gnu-openmpi2-hpc
 Recommends:     libscalapack2-gnu-mpich-hpc
 Recommends:     libscalapack2-gnu-mvapich2-hpc
 Recommends:     libscalapack2-gnu-openmpi2-hpc
-Recommends:     tau-gnu-mvapich2-hpc
-Recommends:     tau-gnu-openmpi2-hpc
 
 Recommends:     libnetcdf-cxx4-gnu-hpc
-Recommends:     mvapich2-psm-gnu-hpc
 Recommends:     python3-numpy-gnu-hpc
 Recommends:     papi-hpc
diff --git a/patterns-hpc.changes b/patterns-hpc.changes
index 1ce6295..9a731be 100644
--- a/patterns-hpc.changes
+++ b/patterns-hpc.changes
@@ -1,3 +1,10 @@
+-------------------------------------------------------------------
+Tue Mar 27 11:23:58 UTC 2018 - cgoll@suse.com
+
+- removed mvapich-psm package as requires for hpc_library and 
+  mvapich2-psm2 is only recommended for x86_64 (bsc#1087038)
+- removed tau libraries and parallel netcdf-devel libraries
+  	
 -------------------------------------------------------------------
 Mon Mar 26 16:51:36 UTC 2018 - eich@suse.com