diff --git a/patterns-base.changes b/patterns-base.changes
index c975151..cd96b21 100644
--- a/patterns-base.changes
+++ b/patterns-base.changes
@@ -1,3 +1,21 @@
+-------------------------------------------------------------------
+Thu May 18 11:28:02 UTC 2017 - lnussel@suse.de
+
+- Recommend zypper-lifecycle-plugin in sw_management for stable
+  distributions
+
+-------------------------------------------------------------------
+Thu May 11 07:18:16 UTC 2017 - sflees@suse.de
+- 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
+  * remove the following from base again as they are in minimal base
+    * openSUSE-build-key
+    * openSUSE-release
+    * rpm
+  * 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 287ca55..01599b7 100644
--- a/patterns-base.spec
+++ b/patterns-base.spec
@@ -141,13 +141,12 @@ Provides:       pattern-icon() = pattern-basis
 Provides:       pattern-order() = 1020
 Provides:       pattern-visible()
 Obsoletes:      patterns-openSUSE-base < %{version}
+Requires:       pattern() = minimal_base
+
 Requires:       kbd
-Requires:       openSUSE-build-key
-Requires:       openSUSE-release
 Requires:       openssh
 Requires:       polkit
 Requires:       polkit-default-privs
-Requires:       procps
 Requires:       rpm
 Requires:       shadow
 Requires:       util-linux
@@ -202,6 +201,8 @@ Provides:       pattern-icon() = yast-system
 Provides:       pattern-order() = 1120
 Provides:       pattern-visible()
 Obsoletes:      patterns-openSUSE-console < %{version}
+Requires:       pattern() = enhanced_base
+Recommends:     pattern() = yast2_basis
 
 Requires:       mc
 Requires:       openssh
@@ -255,42 +256,6 @@ Applications useful for those using the console and no graphical desktop environ
 
 ################################################################################
 
-%package generic_server
-%pattern_serverfunctions
-Summary:        Generic Server
-Group:          Metapackages
-Provides:       pattern() = generic_server
-Provides:       pattern-icon() = yast-ssh-server
-Provides:       pattern-order() = 1130
-Provides:       pattern-visible()
-Requires:       openssh
-Requires:       pattern() = basesystem
-Requires:       pattern() = minimal_base
-Recommends:     pattern() = yast2_basis
-Recommends:     iputils
-Recommends:     ntp
-Recommends:     vim
-Recommends:     screen
-Recommends:     tmux
-Recommends:     mosh
-Recommends:     rsync
-Recommends:     sensors
-Recommends:     libyui-ncurses-pkg
-Recommends:     libyui-ncurses
-Recommends:     command-not-found
-Recommends:     wget
-Provides:       patterns-openSUSE-generic_server = %{version}
-Obsoletes:      patterns-openSUSE-generic_server < %{version}
-
-%description generic_server
-Software that is useful to run on a server.
-
-%files generic_server
-%dir /usr/share/doc/packages/patterns
-/usr/share/doc/packages/patterns/generic_server.txt
-
-################################################################################
-
 %package enhanced_base
 %pattern_basetechnologies
 Summary:        Enhanced Base System
@@ -341,13 +306,10 @@ Recommends:     db-utils
 Recommends:     diffutils
 Recommends:     ethtool
 Recommends:     e2fsprogs
-# provides eject
-Recommends:     util-linux
 Recommends:     file
 Recommends:     fillup
 Recommends:     findutils
 Recommends:     hwinfo
-Recommends:     kbd
 Recommends:     klogd
 # /bin/ip considered useful
 Recommends:     iproute2
@@ -366,15 +328,11 @@ Recommends:     openssh
 Recommends:     perl-base
 # we rely on cron for daily/hourly
 Recommends:     cronie
-# create log file tars
-Recommends:     procps
-Recommends:     shadow
 Recommends:     sysconfig
 Recommends:     systemd-sysvinit
 Recommends:     tar
 Recommends:     time
 Recommends:     wget
-Recommends:     which
 Recommends:     wol
 # split out of ncurses
 Recommends:     ncurses-utils
@@ -615,9 +573,12 @@ Requires:       pam
 Requires:       procps
 Requires:       rpm
 %if 0%{?is_opensuse}
+Requires:       openSUSE-build-key
 Requires:       openSUSE-release
 %else
 Requires:       sles-release
+Recommends:     suse-build-key
+Recommends:     SUSEConnect
 %endif
 Requires:       sysconfig
 Requires:       system-group-hardware
@@ -638,12 +599,6 @@ Recommends:     iproute2
 Recommends:     openssh
 Recommends:     rollback-helper
 Recommends:     snapper
-%if 0%{?is_opensuse}
-Requires:       openSUSE-build-key
-%else
-Recommends:     suse-build-key
-Recommends:     SUSEConnect
-%endif
 Recommends:     sysvinit-tools
 Recommends:     udev
 Suggests:       ed
@@ -741,6 +696,10 @@ Obsoletes:      patterns-openSUSE-sw_management < %{version}
 Recommends:     pattern() = sw_management_x11
 # Zypper is the basic sw_management stack for *SUSE
 Requires:       zypper
+%if 0%{?sle_version}
+Recommends:     zypper-lifecycle-plugin
+Recommends:     lifecycle-data
+%endif
 
 %description sw_management
 This pattern provides a graphical application and a command line tool for keeping your system up to date.
@@ -927,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 generic_server 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"