diff --git a/macros.hpc b/macros.hpc
index 0ef092a..1130efb 100644
--- a/macros.hpc
+++ b/macros.hpc
@@ -89,7 +89,7 @@ EOF\
 # Base
 %hpc_requires Requires: lua-lmod \
 %{?hpc_compiler_family:%{!?_hpc_build_compiler:%hpc_cf_requires}}\
-%{?hpc_mpi_family:%{!?_hpc_build_mpi:%hpc_mpi_requires}}\
+%{?hpc_mpi_family:%{!?_hpc_build_mpi:%hpc_mpi_requires}}
 
 # Devel
 %hpc_requires_devel %{?hpc_compiler_family:%{!?_hpc_build_compiler:%hpc_cf_requires_devel}}\
@@ -176,7 +176,7 @@ EOF\
 #
 # Environment Modules
 #
-%hpc_mpi_family_path %{?hpc_mpi_family:-%{hpc_mpi_family}%([ -n "%{hpc_mpi_dep_version}" ] &&
+%hpc_mpi_family_path %{?hpc_mpi_family:-%{hpc_mpi_family}%([ -n "%{hpc_mpi_dep_version}" ] && \
                      echo -n "-%{hpc_mpi_dep_version}")}
 
 %hpc_compiler_family_path %{?hpc_compiler_family:%{hpc_compiler_family}-%{hpc_cf_dep_version}}
@@ -369,7 +369,7 @@ cat << EOF > %{buildroot}%{hpc_module_dep_base}%{version}
  } \
  %{-n:%define _lname %{-n*}} \
  %{!-n:\
-  %define _lname_cf %{?compiler_family:-%{compiler_family}%{?hpc_cf_pack_version}} \
+  %define _lname_cf %{?compiler_family:-%{hpc_compiler_family}%{?hpc_cf_pack_version}} \
   %define _lname_mpi %{!?_hpc_build_mpi:%{?hpc_mpi_family:-%{hpc_mpi_family}%{?hpc_mpi_pack_version}}} \
   %define _lname_build_mpi_name %{?_hpc_build_mpi:%{hpc_mpi_family}%{?hpc_ext}%{?hpc_mpi_pack_version}} \
   %define _lname_name %{!?_hpc_build_mpi:%{_pname}%{?hpc_ext}%{-s*}} \
@@ -395,7 +395,7 @@ cat << EOF > %{buildroot}%{hpc_module_dep_base}%{version}
  %{!-s:%define n_name %_name} \
  %{-s:%define n_name %(a=%{_name};echo -n ${a/%{_pname}/%{_pname}%{-s*}})} \
  %{!-s:%define s_name %{_mylib}%{n_name}%{_p_ext}} \
- %{-s:%define s_name %(echo -n %{_mylib}%{_name}%{_p_ext} | sed -e "s/\\(.*%{_pname}\\)\\(.*\\)/\\\\1%{-s*}\\\\2/")} \
+ %{-s:%define s_name %(echo -n %{_mylib}%{_name}%{_p_ext} | sed -e "s/\\\\(.*%{_pname}\\\\)\\\\(.*\\\\)/\\\\1%{-s*}\\\\2/")} \
 %package -n %_lname \
 Summary: Dependency package for %{s_name} \
 Group:   %_group \
diff --git a/suse-hpc.changes b/suse-hpc.changes
index 0449dd9..5ca6ee6 100644
--- a/suse-hpc.changes
+++ b/suse-hpc.changes
@@ -1,3 +1,15 @@
+-------------------------------------------------------------------
+Sun Aug 19 12:54:39 UTC 2018 - eich@suse.com
+
+- macros: %hpc_master_package: properly escape '\'
+
+-------------------------------------------------------------------
+Sun Aug 19 09:32:21 UTC 2018 - eich@suse.com
+
+- macros:
+  * Fix line endings
+  * Replace %%compiler_family by %%hpc_compiler_family
+
 -------------------------------------------------------------------
 Tue Jun 19 05:08:01 UTC 2018 - eich@suse.com