diff --git a/aws-cli-1.11.185.tar.gz b/aws-cli-1.11.185.tar.gz
deleted file mode 100644
index 752c7f4..0000000
--- a/aws-cli-1.11.185.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:af4b0105e00098e1f4ba4467c539e9b8f2e9e1d7bc6fb53834790033b40ca7ab
-size 1009042
diff --git a/aws-cli-1.15.40.tar.gz b/aws-cli-1.15.40.tar.gz
new file mode 100644
index 0000000..2fb7033
--- /dev/null
+++ b/aws-cli-1.15.40.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:be54580551ef27cf68792ab4252772d819c7e05153d4498bd8848c7d9dc042aa
+size 1082697
diff --git a/aws-cli.changes b/aws-cli.changes
index 4b67e6e..540c53a 100644
--- a/aws-cli.changes
+++ b/aws-cli.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Jun 19 12:04:32 UTC 2018 - adrian.glaubitz@suse.com
+
+- Update to version 1.15.40 (boo#1088310)
+  + For detailed changes see
+    https://github.com/aws/aws-cli/blob/1.15.40/CHANGELOG.rst
+  + Forward port hide_py_pckgmgmt.patch
+  + Update Requires in spec file from setup.py
+
 -------------------------------------------------------------------
 Fri Nov 10 01:01:18 UTC 2017 - jengelh@inai.de
 
diff --git a/aws-cli.spec b/aws-cli.spec
index eade9f7..9842982 100644
--- a/aws-cli.spec
+++ b/aws-cli.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package aws-cli
 #
-# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -17,7 +17,7 @@
 
 
 Name:           aws-cli
-Version:        1.11.185
+Version:        1.15.40
 Release:        0
 Summary:        Amazon Web Services Command Line Interface
 License:        Apache-2.0
@@ -29,28 +29,28 @@ Patch0:         hide_py_pckgmgmt.patch
 Requires:       python3
 Requires:       python3-PyYAML     <= 3.12
 Requires:       python3-PyYAML     >= 3.10
-Requires:       python3-botocore  >= 1.7.9
+Requires:       python3-botocore  >= 1.10.40
 Requires:       python3-colorama  <= 0.3.9
 Requires:       python3-colorama  >= 0.2.5
 Requires:       python3-docutils  >= 0.10
 Requires:       python3-rsa       <= 3.5.0
 Requires:       python3-rsa       >= 3.1.2
 Requires:       python3-s3transfer <= 0.2.0
-Requires:       python3-s3transfer >= 0.1.9
+Requires:       python3-s3transfer >= 0.1.12
 BuildRequires:  python3-devel
 BuildRequires:  python3-setuptools
 %else
 Requires:       python
 Requires:       python-PyYAML     <= 3.12
 Requires:       python-PyYAML     >= 3.10
-Requires:       python-botocore  >= 1.7.9
+Requires:       python-botocore  >= 1.10.40
 Requires:       python-colorama  <= 0.3.9
 Requires:       python-colorama  >= 0.2.5
 Requires:       python-docutils  >= 0.10
 Requires:       python-rsa       <= 3.5.0
 Requires:       python-rsa       >= 3.1.2
 Requires:       python-s3transfer <= 0.2.0
-Requires:       python-s3transfer >= 0.1.9
+Requires:       python-s3transfer >= 0.1.12
 BuildRequires:  python-devel
 BuildRequires:  python-setuptools
 %endif
diff --git a/hide_py_pckgmgmt.patch b/hide_py_pckgmgmt.patch
index 92b8802..aaf7154 100644
--- a/hide_py_pckgmgmt.patch
+++ b/hide_py_pckgmgmt.patch
@@ -1,33 +1,35 @@
---- setup.py.orig
-+++ setup.py
-@@ -23,18 +23,18 @@ def find_version(*file_paths):
+--- setup.py.orig	2018-06-15 23:45:51.000000000 +0200
++++ setup.py	2018-06-19 14:00:58.013536379 +0200
+@@ -23,18 +23,18 @@
      raise RuntimeError("Unable to find version string.")
  
  
--requires = ['botocore==1.7.43',
--            'colorama>=0.2.5,<=0.3.7',
+-requires = ['botocore==1.10.40',
+-            'colorama>=0.2.5,<=0.3.9',
 -            'docutils>=0.10',
 -            'rsa>=3.1.2,<=3.5.0',
--            's3transfer>=0.1.9,<0.2.0',
+-            's3transfer>=0.1.12,<0.2.0',
 -            'PyYAML>=3.10,<=3.12']
-+#requires = ['botocore==1.7.43',
-+#            'colorama>=0.2.5,<=0.3.7',
-+#            'docutils>=0.10',
-+#            'rsa>=3.1.2,<=3.5.0',
-+#            's3transfer>=0.1.9,<0.2.0',
-+#            'PyYAML>=3.10,<=3.12']
++# requires = ['botocore==1.10.40',
++#             'colorama>=0.2.5,<=0.3.9',
++#             'docutils>=0.10',
++#             'rsa>=3.1.2,<=3.5.0',
++#             's3transfer>=0.1.12,<0.2.0',
++#             'PyYAML>=3.10,<=3.12']
  
  
 -if sys.version_info[:2] == (2, 6):
-+#if sys.version_info[:2] == (2, 6):
-     # For python2.6 we have to require argparse since it
-     # was not in stdlib until 2.7.
+-    # For python2.6 we have to require argparse since it
+-    # was not in stdlib until 2.7.
 -    requires.append('argparse>=1.1')
-+#    requires.append('argparse>=1.1')
++# if sys.version_info[:2] == (2, 6):
++#     # For python2.6 we have to require argparse since it
++#     # was not in stdlib until 2.7.
++#     requires.append('argparse>=1.1')
  
  
  setup_options = dict(
-@@ -51,12 +51,12 @@ setup_options = dict(
+@@ -51,12 +51,12 @@
      package_data={'awscli': ['data/*.json', 'examples/*/*.rst',
                               'examples/*/*/*.rst', 'topics/*.rst',
                               'topics/*.json']},
@@ -37,12 +39,12 @@
 -            'argparse>=1.1',
 -        ]
 -    },
-+#    install_requires=requires,
-+#    extras_require={
-+#        ':python_version=="2.6"': [
-+#            'argparse>=1.1',
-+#        ]
-+#    },
++    # install_requires=requires,
++    # extras_require={
++    #     ':python_version=="2.6"': [
++    #         'argparse>=1.1',
++    #     ]
++    # },
      license="Apache License 2.0",
      classifiers=(
          'Development Status :: 5 - Production/Stable',