diff --git a/create_32bit-patterns_file.pl b/create_32bit-patterns_file.pl
index bc743a7..6c7f9bc 100644
--- a/create_32bit-patterns_file.pl
+++ b/create_32bit-patterns_file.pl
@@ -73,7 +73,7 @@ sub parse_main_file {
 		chomp($line);
 		next if ($line =~ m/^#/);
 		if ($line =~ m/\%package/) {
-			if(($line =~ m/32bit/) or 
+			if(($line =~ m/32bit/) or
 			   ($line =~ m/64bit/)
 			  ) {
 			    $skip_it = 1;
@@ -81,9 +81,9 @@ sub parse_main_file {
 			  %skip_pat_hash =  map { $_ => 1 } @skip_pat;
 			  if($skip_it==0&&!exists($skip_pat_hash{$cur_pattern})) {
 			      $spec_file .=  ""
-					    ."Provides:       pattern() = ${cur_pattern}-32bit\n"
+					    ."Provides:       pattern() = ${cur_pattern}%2d32bit\n"
 					    ."Group:          Metapackages\n"
-					    ."Supplements:    packageand(patterns-${pat_ext}:patterns-${cur_pattern})\n"
+					    ."Supplements:    packageand(patterns-${product}-${pat_ext}:patterns-${product}-${cur_pattern})\n"
 					    ."\n"
 					    ."%files ${cur_pattern}-32bit\n"
 					    ."%defattr(-,root,root)\n"
@@ -123,14 +123,14 @@ sub parse_main_file {
 			$spec_file .= parse_line($line);
 		}
 	}
-	
-	%skip_pat_hash =  map { $_ => 1 } @skip_pat;	
+
+	%skip_pat_hash =  map { $_ => 1 } @skip_pat;
 	if (!exists($skip_pat_hash{$cur_pattern})) {
 		# I hate this, but need a fast workaround
 		$spec_file .=  "Provides:       pattern-invisible()\n"
-			      ."Provides:       pattern() = ${cur_pattern}-${pat_ext}\n"
+			      ."Provides:       pattern() = ${cur_pattern}%2d${pat_ext}\n"
 			      ."Group:          Metapackages\n"
-			      ."Supplements:    packageand(patterns-${pat_ext}:patterns-${cur_pattern})\n"
+			      ."Supplements:    packageand(patterns-${product}-${pat_ext}:patterns-${product}-${cur_pattern})\n"
 			      ."\n"
 			      ."%files ${cur_pattern}-32bit\n"
 			      ."%defattr(-,root,root)\n"
@@ -163,11 +163,10 @@ while ($ARGV[0] && $ARGV[0] =~ /^-/) {
 	} elsif($arg =~ /-s/) {
 		push @skip_pat, shift;
 	}
-	
+
 }
 
 print_debug("product = ${product}\n     pat_ext=${pat_ext}\n", 1);
 my $result = parse_main_file("patterns-${product}.spec");
 print "${result}\n";
 exit 0;
-
diff --git a/pattern-definition-32bit.txt b/pattern-definition-32bit.txt
index dc24cfa..884c839 100644
--- a/pattern-definition-32bit.txt
+++ b/pattern-definition-32bit.txt
@@ -38,9 +38,9 @@ Recommends:     binutils-devel-32bit
 Recommends:     e2fsprogs-devel-32bit
 Recommends:     libapparmor-devel-32bit
 Recommends:     libosip2-devel-32bit
-Provides:       pattern() = devel_basis-32bit
+Provides:       pattern() = devel_basis%2d32bit
 Group:          Metapackages
-Supplements:    packageand(patterns-32bit:patterns-devel_basis)
+Supplements:    packageand(patterns-devel-base-32bit:patterns-devel-base-devel_basis)
 
 %files devel_basis-32bit
 %defattr(-,root,root)
@@ -64,9 +64,9 @@ Recommends:     quilt-32bit
 Recommends:     gitk-32bit
 Recommends:     git-email-32bit
 Recommends:     kernel-syms-32bit
-Provides:       pattern() = devel_kernel-32bit
+Provides:       pattern() = devel_kernel%2d32bit
 Group:          Metapackages
-Supplements:    packageand(patterns-32bit:patterns-devel_kernel)
+Supplements:    packageand(patterns-devel-base-32bit:patterns-devel-base-devel_kernel)
 
 %files devel_kernel-32bit
 %defattr(-,root,root)
diff --git a/patterns-devel-base.changes b/patterns-devel-base.changes
index ca9dc4c..12088c0 100644
--- a/patterns-devel-base.changes
+++ b/patterns-devel-base.changes
@@ -1,5 +1,11 @@
 -------------------------------------------------------------------
-Mon Dec 11 11:25:36 UTC 2017 - simonf.lees@suse.com
+Thu Jul 19 12:07:25 UTC 2018 - sflees@suse.de
+
+- Merge with the version from SLE/Leap 15 full changes now below
+  in the changelog.
+
+-------------------------------------------------------------------
+Mon Dec 11 11:25:36 UTC 2017 - sflees@suse.de
 
 - correctly source the files for 32bit patterns
 
diff --git a/patterns-devel-base.spec b/patterns-devel-base.spec
index f044413..65fd8a8 100644
--- a/patterns-devel-base.spec
+++ b/patterns-devel-base.spec
@@ -285,6 +285,7 @@ for i in devel_rpm_build devel_web; do
 	echo "This file marks the pattern $i to be installed." \
 		>"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"
 done
+
 %endif
 
 for i in devel_basis devel_kernel; do
diff --git a/pre_checkin.sh b/pre_checkin.sh
index e823000..1fd29f9 100644
--- a/pre_checkin.sh
+++ b/pre_checkin.sh
@@ -1,4 +1,3 @@
 #!/bin/sh
 
 ./create_32bit-patterns_file.pl -p devel-base -s  devel_rpm_build -s devel_web > pattern-definition-32bit.txt
-