diff --git a/src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs b/src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs
index e777900f667b..ff0e1a17a62c 100644
--- a/src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs
+++ b/src/ResourceManager/Compute/Commands.Compute/Extension/DSC/SetAzureVMDscExtensionCommand.cs
@@ -190,7 +190,7 @@ public class SetAzureVMDscExtensionCommand : VirtualMachineExtensionBaseCmdlet
         ///
         /// The DSC Azure Extension depends on DSC features that are only available in 
         /// the WMF updates. This parameter specifies which version of the update to 
-        /// install on the VM. The possible values are "4.0","latest" and "5.0PP".  
+        /// install on the VM. The possible values are "4.0","latest" and "5.0".  
         /// 
         /// A value of "4.0" will install KB3000850 
         /// (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server 
@@ -198,15 +198,15 @@ public class SetAzureVMDscExtensionCommand : VirtualMachineExtensionBaseCmdlet
         /// (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other 
         /// versions of Windows if a newer version isnt already installed.
         /// 
-        /// A value of "5.0PP" will install the latest release of WMF 5.0PP 
-        /// (http://go.microsoft.com/fwlink/?LinkId=398175).
+        /// A value of "5.0" will install the latest release of WMF 5.0 
+        /// (https://www.microsoft.com/en-us/download/details.aspx?id=50395).
         /// 
-        /// A value of "latest" will install the latest WMF, currently WMF 5.0PP
+        /// A value of "latest" will install the latest WMF, currently WMF 5.0
         /// 
         /// The default value is "latest"
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        [ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP" })]
+        [ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP", "5.0" })]
         public string WmfVersion { get; set; }
 
         /// <summary>
diff --git a/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml b/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml
index d76987a88f0b..76d2ee05f3b6 100644
--- a/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml
+++ b/src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.dll-Help.xml
@@ -13493,9 +13493,9 @@ Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName
 				<maml:name>WmfVersion</maml:name>
 				<maml:description>
 					<maml:para>
-            Specifies the version of the Windows Management Framework (WMF) to install on the VM. The DSC Azure Extension depends on DSC features that are only available in the WMF updates. This parameter specifies which version of the update to install on the VM. The possible values are &quot;4.0&quot;,&quot;latest&quot; and &quot;5.0PP&quot;.
+            Specifies the version of the Windows Management Framework (WMF) to install on the VM. The DSC Azure Extension depends on DSC features that are only available in the WMF updates. This parameter specifies which version of the update to install on the VM. The possible values are &quot;4.0&quot;,&quot;latest&quot; and &quot;5.0&quot;.
             A value of &quot;4.0&quot; will install KB3000850 (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server 2012 R2, or WMF 4.0 (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other versions of Windows if a newer version isnt already installed.
-            A value of &quot;5.0PP&quot; will install the latest release of WMF 5.0PP (http://go.microsoft.com/fwlink/?LinkId=398175). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0PP. The default value is &quot;latest&quot;</maml:para>
+            A value of &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;</maml:para>
 				</maml:description>
 				<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
 			</command:parameter>
@@ -13721,9 +13721,9 @@ Set-AzureRmVMDiskEncryptionExtension -ResourceGroupName $rgname -VMName $vmName
 			<maml:name>WmfVersion</maml:name>
 			<maml:description>
 				<maml:para>
-            Specifies the version of the Windows Management Framework (WMF) to install on the VM. The DSC Azure Extension depends on DSC features that are only available in the WMF updates. This parameter specifies which version of the update to install on the VM. The possible values are &quot;4.0&quot;,&quot;latest&quot; and &quot;5.0PP&quot;.
+            Specifies the version of the Windows Management Framework (WMF) to install on the VM. The DSC Azure Extension depends on DSC features that are only available in the WMF updates. This parameter specifies which version of the update to install on the VM. The possible values are &quot;4.0&quot;,&quot;latest&quot; and &quot;5.0&quot;.
             A value of &quot;4.0&quot; will install KB3000850 (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server 2012 R2, or WMF 4.0 (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other versions of Windows if a newer version isnt already installed.
-            A value of &quot;5.0PP&quot; will install the latest release of WMF 5.0PP (http://go.microsoft.com/fwlink/?LinkId=398175). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0PP. The default value is &quot;latest&quot;</maml:para>
+            A value of &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;</maml:para>
 			</maml:description>
 			<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
 			<dev:type>
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs
index 5328a8dfdf71..8bc9071ce65d 100644
--- a/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs
+++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/Extensions/DSC/SetAzureVMDscExtension.cs
@@ -138,7 +138,7 @@ public class SetAzureVMDscExtension : VirtualMachineExtensionCmdletBase
         ///
         /// The DSC Azure Extension depends on DSC features that are only available in 
         /// the WMF updates. This parameter specifies which version of the update to 
-        /// install on the VM. The possible values are "4.0","latest" and "5.0PP".  
+        /// install on the VM. The possible values are "4.0","latest" and "5.0".  
         /// 
         /// A value of "4.0" will install KB3000850 
         /// (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server 
@@ -146,15 +146,15 @@ public class SetAzureVMDscExtension : VirtualMachineExtensionCmdletBase
         /// (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other 
         /// versions of Windows if a newer version isnt already installed.
         /// 
-        /// A value of "5.0PP" will install the latest release of WMF 5.0PP 
-        /// (http://go.microsoft.com/fwlink/?LinkId=398175).
+        /// A value of "5.0" will install the latest release of WMF 5.0 
+        /// (https://www.microsoft.com/en-us/download/details.aspx?id=50395).
         /// 
-        /// A value of "latest" will install the latest WMF, currently WMF 5.0PP
+        /// A value of "latest" will install the latest WMF, currently WMF 5.0
         /// 
         /// The default value is "latest"
         /// </summary>
         [Parameter(ValueFromPipelineByPropertyName = true)]
-        [ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP" })]
+        [ValidateSetAttribute(new[] { "4.0", "latest", "5.0PP", "5.0" })]
         public string WmfVersion { get; set; }
 
         /// <summary>
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml b/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml
index 3e7047308c4a..ed38204219b4 100644
--- a/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml
+++ b/src/ServiceManagement/Compute/Commands.ServiceManagement/Microsoft.WindowsAzure.Commands.ServiceManagement.dll-Help.xml
@@ -36552,6 +36552,16 @@ PS C:\&gt; Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
           </maml:description>
           <command:parameterValue required="true" variableLength="false">IPersistentVM</command:parameterValue>
         </command:parameter>
+        <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
+				<maml:name>WmfVersion</maml:name>
+				<maml:description>
+					<maml:para>
+            Specifies the version of the Windows Management Framework (WMF) to install on the VM. The DSC Azure Extension depends on DSC features that are only available in the WMF updates. This parameter specifies which version of the update to install on the VM. The possible values are &quot;4.0&quot;,&quot;latest&quot; and &quot;5.0&quot;.
+            A value of &quot;4.0&quot; will install KB3000850 (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server 2012 R2, or WMF 4.0 (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other versions of Windows if a newer version isnt already installed.
+            A value of &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;</maml:para>
+				</maml:description>
+				<command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+			  </command:parameter>
         <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
           <maml:name>DataCollection</maml:name>
           <maml:description>
@@ -36726,6 +36736,21 @@ PS C:\&gt; Update-AzureVM -ServiceName $Service_Name -Name $VM_Name -VM $VM_Upda
         </dev:type>
         <dev:defaultValue>none</dev:defaultValue>
       </command:parameter>
+      <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="true (ByPropertyName)" position="named">
+			  <maml:name>WmfVersion</maml:name>
+			  <maml:description>
+				<maml:para>
+            Specifies the version of the Windows Management Framework (WMF) to install on the VM. The DSC Azure Extension depends on DSC features that are only available in the WMF updates. This parameter specifies which version of the update to install on the VM. The possible values are &quot;4.0&quot;,&quot;latest&quot; and &quot;5.0&quot;.
+            A value of &quot;4.0&quot; will install KB3000850 (http://support.microsoft.com/kb/3000850) on Windows 8.1 or Windows Server 2012 R2, or WMF 4.0 (http://www.microsoft.com/en-us/download/details.aspx?id=40855) on other versions of Windows if a newer version isnt already installed.
+            A value of &quot;5.0&quot; will install the latest release of WMF 5.0 (https://www.microsoft.com/en-us/download/details.aspx?id=50395). A value of &quot;latest&quot; will install the latest WMF, currently WMF 5.0. The default value is &quot;latest&quot;</maml:para>
+			  </maml:description>
+			  <command:parameterValue required="true" variableLength="false">String</command:parameterValue>
+			  <dev:type>
+				  <maml:name>String</maml:name>
+				  <maml:uri/>
+			  </dev:type>
+			  <dev:defaultValue>latest</dev:defaultValue>
+		  </command:parameter>
       <command:parameter required="false" variableLength="false" globbing="false" pipelineInput="false" position="named">
         <maml:name>DataCollection</maml:name>
         <maml:description>