diff --git a/ipmctl-fix-SLE12-build.patch b/ipmctl-fix-SLE12-build.patch
index 254f4bb..f927c43 100644
--- a/ipmctl-fix-SLE12-build.patch
+++ b/ipmctl-fix-SLE12-build.patch
@@ -1,6 +1,6 @@
 ---
- CMakeLists.txt |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
+ CMakeLists.txt |    8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
@@ -17,3 +17,21 @@
  		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fstack-protector-strong")
  	endif()
  endif()
+@@ -376,6 +376,7 @@ if(MSVC)
+ 	set_target_properties(ipmctl-bin PROPERTIES LINK_FLAGS "/STACK:3000000")
+ else()
+ 	target_compile_options(ipmctl-bin PRIVATE "-fPIE")
++	set_target_properties(ipmctl-bin PROPERTIES LINK_FLAGS "-pie")
+ endif()
+ 
+ #---------------------------------------------------------------------------------------------------
+@@ -414,7 +415,8 @@ if (NOT ESX_BUILD)
+ 		)
+ 
+ if(UNIX)
+-        target_compile_options(ipmctl-monitor PRIVATE "-fPIE")
++	target_compile_options(ipmctl-monitor PRIVATE "-fPIE")
++	set_target_properties(ipmctl-monitor PROPERTIES LINK_FLAGS "-pie")
+ endif()
+ 
+ endif()
diff --git a/ipmctl.changes b/ipmctl.changes
index afe484d..7eb2505 100644
--- a/ipmctl.changes
+++ b/ipmctl.changes
@@ -1,7 +1,13 @@
+-------------------------------------------------------------------
+Wed Oct 17 10:24:17 UTC 2018 - rw@suse.com
+
+- Improve ipmctl-fix-SLE12-build.patch to produce position
+  independent executables.
+
 -------------------------------------------------------------------
 Wed Oct 10 14:28:25 UTC 2018 - rw@suse.com
 
-- Remove build dependency on python2.  [bsc#1111020]
+- Remove hard build dependency on python2.  [bsc#1111020]
 
 -------------------------------------------------------------------
 Fri Aug 10 15:28:34 UTC 2018 - rw@suse.com
diff --git a/ipmctl.spec b/ipmctl.spec
index 48e92d7..1076cbc 100644
--- a/ipmctl.spec
+++ b/ipmctl.spec
@@ -28,7 +28,11 @@ Source1:        %{name}-rpmlintrc
 Patch1:         ipmctl-fix-SLE12-build.patch
 
 Requires:       libipmctl2%{?_isa} = %{version}-%{release}
+%if %{defined pythons}
 BuildRequires:  %{pythons}
+%else
+BuildRequires:  python2
+%endif
 BuildRequires:  cmake
 BuildRequires:  gcc-c++
 BuildRequires:  pkgconfig