diff --git a/patterns-base.changes b/patterns-base.changes
index cd96b21..9014eeb 100644
--- a/patterns-base.changes
+++ b/patterns-base.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Thu Jun  8 09:49:25 UTC 2017 - dimstar@opensuse.org
+
+- Rename pattern minimal_base-conflicts to minimal_base_conflicts:
+  we fall into a neat trap with
+     Provides: pattern() = minimal_base-conflicts
+  As this is translated to RPM lingo, meaning 'minimal_base' is the
+  'version' and 'conflicts' the 'release'; so anything requiring
+  pattern() = minimal_base is satisfied by minimal_base-conflicts
+  directly too (boo#1043348).
+
 -------------------------------------------------------------------
 Thu May 18 11:28:02 UTC 2017 - lnussel@suse.de
 
@@ -6,7 +17,7 @@ Thu May 18 11:28:02 UTC 2017 - lnussel@suse.de
 
 -------------------------------------------------------------------
 Thu May 11 07:18:16 UTC 2017 - sflees@suse.de
-- Proper fixes for the last change re generic_server, 
+- Proper fixes for the last change re generic_server,
   * console should require enhanced_base so its functionally the
     same as x11
   *  base should require minimal_base
@@ -14,7 +25,7 @@ Thu May 11 07:18:16 UTC 2017 - sflees@suse.de
     * openSUSE-build-key
     * openSUSE-release
     * rpm
-  * other minor tidyup's 
+  * other minor tidyup's
 
 -------------------------------------------------------------------
 Wed May 10 19:44:25 UTC 2017 - dleuenberger@suse.com
diff --git a/patterns-base.spec b/patterns-base.spec
index 01599b7..b6cb216 100644
--- a/patterns-base.spec
+++ b/patterns-base.spec
@@ -557,7 +557,7 @@ Provides:       pattern() = minimal_base
 Provides:       pattern-icon() = yast-sw_single
 Provides:       pattern-order() = 5190
 Obsoletes:      patterns-openSUSE-minimal_base < %{version}
-Recommends:     pattern() = minimal_base-conflicts
+Recommends:     pattern() = minimal_base_conflicts
 
 Requires:       aaa_base
 Requires:       bash
@@ -616,12 +616,12 @@ This is the minimal openSUSE runtime system. It is really a minimal system, you
 
 ################################################################################
 
-%package minimal_base-conflicts
+%package minimal_base_conflicts
 %pattern_basetechnologies
 Summary:        Base System
 Group:          Metapackages
 Provides:       patterns-openSUSE-minimal_base-conflicts = %{version}
-Provides:       pattern() = minimal_base-conflicts
+Provides:       pattern() = minimal_base_conflicts
 Provides:       pattern-icon() = yast-sw_single
 Provides:       pattern-order() = 5191
 Obsoletes:      patterns-openSUSE-minimal_base-conflicts < %{version}
@@ -674,12 +674,12 @@ Conflicts:      openssh-askpass
 # requires all kinds of perl modules
 Conflicts:      xdg-utils
 
-%description minimal_base-conflicts
+%description minimal_base_conflicts
 This is the base runtime system.  It contains only a minimal multiuser booting system. For running on real hardware, you need to add additional packages and pattern to make this pattern useful on its own.
 
-%files minimal_base-conflicts
+%files minimal_base_conflicts
 %dir /usr/share/doc/packages/patterns
-/usr/share/doc/packages/patterns/minimal_base-conflicts.txt
+/usr/share/doc/packages/patterns/minimal_base_conflicts.txt
 
 ################################################################################
 
@@ -886,7 +886,7 @@ This will install the 32-bit variant of all selected patterns. This allows to ex
 %install
 mkdir -p %{buildroot}/usr/share/doc/packages/patterns
 for i in 32bit 64bit apparmor apparmor_opt base console enhanced_base \
-    enhanced_base_opt minimal_base minimal_base-conflicts sw_management \
+    enhanced_base_opt minimal_base minimal_base_conflicts sw_management \
     update_test x11 x11_opt x86; do
 	echo "This file marks the pattern $i to be installed." \
 		>"%{buildroot}/usr/share/doc/packages/patterns/$i.txt"