diff --git a/AutoRest/Generators/Python/Azure.Python/AzurePythonCodeGenerator.cs b/AutoRest/Generators/Python/Azure.Python/AzurePythonCodeGenerator.cs
index 400b4b6747249..464cc1fe44548 100644
--- a/AutoRest/Generators/Python/Azure.Python/AzurePythonCodeGenerator.cs
+++ b/AutoRest/Generators/Python/Azure.Python/AzurePythonCodeGenerator.cs
@@ -19,7 +19,7 @@ namespace Microsoft.Rest.Generator.Azure.Python
 {
     public class AzurePythonCodeGenerator : PythonCodeGenerator
     {
-        private const string ClientRuntimePackage = "msrestazure version 0.3.0";
+        private const string ClientRuntimePackage = "msrestazure version 0.4.0";
 
         // page extensions class dictionary.
         private IList<PageTemplateModel> pageModels;
diff --git a/AutoRest/Generators/Python/Azure.Python/TemplateModels/AzureServiceClientTemplateModel.cs b/AutoRest/Generators/Python/Azure.Python/TemplateModels/AzureServiceClientTemplateModel.cs
index 0a3b44b0e6446..c43fa7afe5ac6 100644
--- a/AutoRest/Generators/Python/Azure.Python/TemplateModels/AzureServiceClientTemplateModel.cs
+++ b/AutoRest/Generators/Python/Azure.Python/TemplateModels/AzureServiceClientTemplateModel.cs
@@ -97,7 +97,7 @@ public override string SetupRequires
         {
             get
             {
-                return "\"msrest>=0.3.0\", \"msrestazure>=0.3.0\"";
+                return "\"msrest>=0.4.0\", \"msrestazure>=0.4.0\"";
             }
         }
 
diff --git a/AutoRest/Generators/Python/Python/PythonCodeGenerator.cs b/AutoRest/Generators/Python/Python/PythonCodeGenerator.cs
index 8131b8cba6d34..3eea27500c5b0 100644
--- a/AutoRest/Generators/Python/Python/PythonCodeGenerator.cs
+++ b/AutoRest/Generators/Python/Python/PythonCodeGenerator.cs
@@ -16,7 +16,7 @@ namespace Microsoft.Rest.Generator.Python
 {
     public class PythonCodeGenerator : CodeGenerator
     {
-        private const string ClientRuntimePackage = "msrest version 0.3.0";
+        private const string ClientRuntimePackage = "msrest version 0.4.0";
 
         public PythonCodeGenerator(Settings settings) : base(settings)
         {
diff --git a/ClientRuntimes/Python/msrest/doc/conf.py b/ClientRuntimes/Python/msrest/doc/conf.py
index 169d6053b55f8..04f96a303f040 100644
--- a/ClientRuntimes/Python/msrest/doc/conf.py
+++ b/ClientRuntimes/Python/msrest/doc/conf.py
@@ -57,9 +57,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.0'
+version = '0.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.0'
+release = '0.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ClientRuntimes/Python/msrest/msrest/version.py b/ClientRuntimes/Python/msrest/msrest/version.py
index 527b2a717c20b..b53eff34fb92c 100644
--- a/ClientRuntimes/Python/msrest/msrest/version.py
+++ b/ClientRuntimes/Python/msrest/msrest/version.py
@@ -25,4 +25,4 @@
 # --------------------------------------------------------------------------
 
 
-msrest_version = "0.3.0"
+msrest_version = "0.4.0"
diff --git a/ClientRuntimes/Python/msrest/readme.rst b/ClientRuntimes/Python/msrest/readme.rst
index b65e1bf5b13a5..3ddf58e590307 100644
--- a/ClientRuntimes/Python/msrest/readme.rst
+++ b/ClientRuntimes/Python/msrest/readme.rst
@@ -15,6 +15,19 @@ To install:
 Release History
 ---------------
 
+2016-05-25 Version 0.4.0
+++++++++++++++++++++++++
+
+This version has no bug fixes, but implements new features of Autorest:
+- Base64 url type
+- unixtime type
+- x-ms-enum modelAsString flag
+
+**Behaviour changes**
+
+- Add Platform information in UserAgent
+- Needs Autorest > 0.17.0 Nightly 20160525
+
 2016-04-26 Version 0.3.0
 ++++++++++++++++++++++++
 
diff --git a/ClientRuntimes/Python/msrest/setup.py b/ClientRuntimes/Python/msrest/setup.py
index 02bdd49b71aab..db7fd3f5e3e1c 100644
--- a/ClientRuntimes/Python/msrest/setup.py
+++ b/ClientRuntimes/Python/msrest/setup.py
@@ -28,7 +28,7 @@
 
 setup(
     name='msrest',
-    version='0.3.0',
+    version='0.4.0',
     author='Microsoft Corporation',
     packages=['msrest'],
     url=("https://github.com/xingwu1/autorest/tree/python/"
diff --git a/ClientRuntimes/Python/msrest_build.sh b/ClientRuntimes/Python/msrest_build.sh
new file mode 100644
index 0000000000000..36564a7ad488d
--- /dev/null
+++ b/ClientRuntimes/Python/msrest_build.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+pushd msrest
+rm -rf dist
+python3 ./setup.py sdist --formats=zip
+python3 ./setup.py bdist_wheel
+python2 ./setup.py bdist_wheel
+popd
+
+pushd msrestazure
+rm -rf dist
+python3 ./setup.py sdist --formats=zip
+python3 ./setup.py bdist_wheel
+python2 ./setup.py bdist_wheel
+popd
diff --git a/ClientRuntimes/Python/msrestazure/doc/conf.py b/ClientRuntimes/Python/msrestazure/doc/conf.py
index 1225f72e6ec9d..06750e9eebb27 100644
--- a/ClientRuntimes/Python/msrestazure/doc/conf.py
+++ b/ClientRuntimes/Python/msrestazure/doc/conf.py
@@ -58,9 +58,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.3.0'
+version = '0.4.0'
 # The full version, including alpha/beta/rc tags.
-release = '0.3.0'
+release = '0.4.0'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
diff --git a/ClientRuntimes/Python/msrestazure/msrestazure/version.py b/ClientRuntimes/Python/msrestazure/msrestazure/version.py
index edb859f0a87d2..e197321775857 100644
--- a/ClientRuntimes/Python/msrestazure/msrestazure/version.py
+++ b/ClientRuntimes/Python/msrestazure/msrestazure/version.py
@@ -24,4 +24,4 @@
 #
 # --------------------------------------------------------------------------
 
-msrestazure_version = "0.3.0"
+msrestazure_version = "0.4.0"
diff --git a/ClientRuntimes/Python/msrestazure/readme.rst b/ClientRuntimes/Python/msrestazure/readme.rst
index 7ba256b12c10a..a45eb88576f46 100644
--- a/ClientRuntimes/Python/msrestazure/readme.rst
+++ b/ClientRuntimes/Python/msrestazure/readme.rst
@@ -15,6 +15,21 @@ To install:
 Release History
 ---------------
 
+2016-05-25 Version 0.4.0
+++++++++++++++++++++++++
+
+Update msrest dependency to 0.4.0
+
+**Bugfixes**
+
+- Fix for several AAD issues https://github.com/Azure/autorest/issues/1055
+- Fix for LRO PATCH bug and refactor https://github.com/Azure/autorest/issues/993
+
+**Behaviour changes**
+
+- Needs Autorest > 0.17.0 Nightly 20160525
+
+
 2016-04-26 Version 0.3.0
 ++++++++++++++++++++++++
 
diff --git a/ClientRuntimes/Python/msrestazure/setup.py b/ClientRuntimes/Python/msrestazure/setup.py
index 7778b0185d42b..7e8e92b2d7dda 100644
--- a/ClientRuntimes/Python/msrestazure/setup.py
+++ b/ClientRuntimes/Python/msrestazure/setup.py
@@ -28,7 +28,7 @@
 
 setup(
     name='msrestazure',
-    version='0.3.0',
+    version='0.4.0',
     author='Microsoft Corporation',
     packages=['msrestazure'],
     url=('https://github.com/xingwu1/autorest/tree/python/'
@@ -49,5 +49,5 @@
         'License :: OSI Approved :: MIT License',
         'Topic :: Software Development'],
     install_requires=[
-        "msrest>=0.3.0"],
+        "msrest>=0.4.0"],
 )