diff --git a/Erlang/erlang.nuspec b/Erlang/erlang.nuspec
index c90eb97..0fdc6c6 100644
--- a/Erlang/erlang.nuspec
+++ b/Erlang/erlang.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>erlang</id>
     <title>Erlang</title>
-    <version>24.0</version>
+    <version>25.0</version>
     <authors>Joe Armstrong,Robert Virding,Mike Williams</authors>
     <owners>Onorio Catenacci</owners>
     <summary>Erlang/OTP - for building concurrent, distributed, and fault tolerant systems</summary>
@@ -13,14 +13,14 @@ OTP is set of Erlang libraries and design principles providing middle-ware to de
     <projectUrl>http://www.erlang.org/</projectUrl>
     <tags>erlang languages</tags>
     <copyright>erlang.org</copyright>
-    <licenseUrl>http://www.erlang.org/EPLICENSE</licenseUrl>
+    <licenseUrl>https://github.com/erlang/otp/blob/OTP-25.0/LICENSE.txt</licenseUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <iconUrl>https://github.com/smerchek/nugetpackages/raw/master/Erlang/erlang-logo.png</iconUrl>
     <packageSourceUrl>https://github.com/ElixirWin/ChocolateyPackages/tree/master/Erlang</packageSourceUrl>
-    <releaseNotes>https://erlang.org/download/OTP-24.0.README</releaseNotes>
+    <releaseNotes>https://github.com/erlang/otp/blob/OTP-25.0/README.md</releaseNotes>
     <docsUrl>http://erlang.org/doc/search/</docsUrl>
     <mailingListUrl>http://erlang.org/mailman/listinfo/erlang-questions</mailingListUrl>
-    <bugTrackerUrl>https://bugs.erlang.org/secure/Dashboard.jspa</bugTrackerUrl>
+    <bugTrackerUrl>https://github.com/erlang/otp/issues</bugTrackerUrl>
     <projectSourceUrl>https://github.com/erlang/otp</projectSourceUrl>
   </metadata>
 </package>
diff --git a/Erlang/tools/chocolateyInstall.ps1 b/Erlang/tools/chocolateyInstall.ps1
index adf9271..bf7ef0d 100644
--- a/Erlang/tools/chocolateyInstall.ps1
+++ b/Erlang/tools/chocolateyInstall.ps1
@@ -4,34 +4,32 @@ An install script for installing Erlang silently on the machine via ChocolateyNu
 
 .NOTES
 Author: Onorio Catenacci - catenacci@ieee.org
-Version: 24.0
 #>
 
 $package = 'erlang'
-$version = '24.0'
-$erl_version = '12.0'
+$version = '25.0'
 
 $params = @{
   PackageName = $package
   FileType = 'exe'
   SilentArgs = '/S'
-  Url = "https://erlang.org/download/otp_win32_$version.exe"
-  CheckSum = 'ccc1e5918aefb543d2b5e7547c44e1b1ff66d62cd4ea74dd4782f694a6de8a44'
+  Url = "https://github.com/erlang/otp/releases/download/OTP-$version/otp_win32_$version.exe"
+  CheckSum = '413c89f923e4d426b26c4992f010f2d5b064b1169404ad22c444eb25be43c12c'
   CheckSumType = 'sha256'
-  Url64 = "https://erlang.org/download/otp_win64_$version.exe"
-  CheckSum64 = 'f13311ae26d5260566740f8a7f124d0ba3589a1f52aada84b236825641f53225'
+  Url64 = "https://github.com/erlang/otp/releases/download/OTP-$version/otp_win64_$version.exe"
+  CheckSum64 = 'f720bf4eb5f98304007252bd11816fc973aa5e9f53d0c4060f6875d0fdc40818'
   CheckSumType64 = 'sha256'
   validExitCodes = @(0)
 }
 
 Install-ChocolateyPackage @params
 
-$baseErlangPath = "$env:ProgramFiles\erl-$version\erts-$erl_version\bin"
+$baseErlangPath = Resolve-Path "$env:ProgramFiles\Erlang OTP\erts-*\bin"
 
-Generate-BinFile "ct_run" -path "$baseErlangPath\ct_run.exe"
-Generate-BinFile "erl" -path "$baseErlangPath\erl.exe"
-Generate-BinFile "werl" -path "$baseErlangPath\werl.exe"
-Generate-BinFile "erlc" -path "$baseErlangPath\erlc.exe"
-Generate-BinFile "escript" -path "$baseErlangPath\escript.exe"
-Generate-BinFile "dialyzer" -path "$baseErlangPath\dialyzer.exe"
-Generate-BinFile "typer" -path "$baseErlangPath\typer.exe"
+Generate-BinFile ct_run   -Path "$baseErlangPath\ct_run.exe"
+Generate-BinFile dialyzer -Path "$baseErlangPath\dialyzer.exe"
+Generate-BinFile erl      -Path "$baseErlangPath\erl.exe"
+Generate-BinFile erlc     -Path "$baseErlangPath\erlc.exe"
+Generate-BinFile escript  -Path "$baseErlangPath\escript.exe"
+Generate-BinFile typer    -Path "$baseErlangPath\typer.exe"
+Generate-BinFile werl     -Path "$baseErlangPath\werl.exe"
diff --git a/Erlang/tools/chocolateyUninstall.ps1 b/Erlang/tools/chocolateyUninstall.ps1
index dc4c5d2..926740b 100644
--- a/Erlang/tools/chocolateyUninstall.ps1
+++ b/Erlang/tools/chocolateyUninstall.ps1
@@ -1,17 +1,9 @@
-$package = 'erlang'
-$version = '24.0'
-$erl_version = '12.0'
-
-Start-Process -Wait "$env:ProgramFiles\erl-$version\uninstall.exe" -ArgumentList "/S"
-
-#And remove the shim files as well.
-$baseErlangPath = "$env:ProgramFiles\erl-$version\erts-$erl_version\bin"
-
-Remove-BinFile "ct_run" -path "$baseErlangPath\ct_run.exe"
-Remove-BinFile "erl" -path "$baseErlangPath\erl.exe"
-Remove-BinFile "werl" -path "$baseErlangPath\werl.exe"
-Remove-BinFile "erlc" -path "$baseErlangPath\erlc.exe"
-Remove-BinFile "escript" -path "$baseErlangPath\escript.exe"
-Remove-BinFile "dialyzer" -path "$baseErlangPath\dialyzer.exe"
-Remove-BinFile "typer" -path "$baseErlangPath\typer.exe"
-
+Start-Process -Wait "$env:ProgramFiles\Erlang OTP\uninstall.exe" -ArgumentList "/S"
+
+Remove-BinFile ct_run
+Remove-BinFile dialyzer
+Remove-BinFile erl
+Remove-BinFile erlc
+Remove-BinFile escript
+Remove-BinFile typer
+Remove-BinFile werl
diff --git a/Rebar/rebar.nuspec b/Rebar/rebar.nuspec
index e03a45b..c69163d 100644
--- a/Rebar/rebar.nuspec
+++ b/Rebar/rebar.nuspec
@@ -3,7 +3,7 @@
   <metadata>
     <id>rebar3</id>
     <title>Rebar3</title>
-    <version>3.9.0</version>
+    <version>3.18.0</version>
     <authors>Fred Hebert, Tristan Sloughter</authors>
     <owners>Onorio Catenacci</owners>
     <summary>Erlang build tool.</summary>
diff --git a/Rebar/tools/chocolateyInstall.ps1 b/Rebar/tools/chocolateyInstall.ps1
index 8fc562a..11b0104 100644
--- a/Rebar/tools/chocolateyInstall.ps1
+++ b/Rebar/tools/chocolateyInstall.ps1
@@ -1,7 +1,12 @@
 $package = 'rebar3'
-$version = '3.9.0'
+$version = '3.18.0'
 
 $toolsDir = $(Split-Path -Parent $MyInvocation.MyCommand.Definition)
-Get-ChocolateyWebFile -packageName $package -fileFullPath $toolsDir/$package -url "https://github.com/erlang/$package/releases/download/$version/rebar3" -Checksum '6bfe8a0ec4b0e615c244bf678577a2583224dc9ede57f6c1b3d1bc12bfe1ec05' -Checksumtype 'sha256'
+Get-ChocolateyWebFile `
+    -PackageName $package `
+    -FileFullPath "$toolsDir/$package" `
+    -Url "https://github.com/erlang/$package/releases/download/$version/rebar3" `
+    -Checksum 'f3e2641be923ce23076ce4843ee61c63fb392bc6c44dc9d129e4b31f7e136ff0' `
+    -Checksumtype 'sha256'
 
-Install-BinFile "rebar3" -path "$toolsDir/rebar3.cmd"
+Install-BinFile rebar3 -Path "$toolsDir/rebar3.cmd"
diff --git a/Rebar/tools/chocolateyUninstall.ps1 b/Rebar/tools/chocolateyUninstall.ps1
index e941041..6e129a0 100644
--- a/Rebar/tools/chocolateyUninstall.ps1
+++ b/Rebar/tools/chocolateyUninstall.ps1
@@ -1,7 +1,4 @@
-$package = 'rebar3'
-$version = '3.9.0'
-
-#Note that this process will _not_ uninstall Erlang.
+#Note that this process will _not_ uninstall Erlang.
 #Remove the shim file.
 $toolsDir = $(Split-Path -Parent $MyInvocation.MyCommand.Definition)
-Remove-BinFile "rebar3" -path "$toolsDir/rebar3.cmd"
+Remove-BinFile rebar3
diff --git a/Rebar/tools/rebar3.cmd b/Rebar/tools/rebar3.cmd
index ade89ad..95ddca2 100644
--- a/Rebar/tools/rebar3.cmd
+++ b/Rebar/tools/rebar3.cmd
@@ -43,4 +43,3 @@ for %%r in ("%rebar_escript_path%") do @(set rebar_escript_path=%%~sr)
 @set erts_bin_dir=%erl_root%\%erts_dir_name%\bin
 @for %%e in ("%erts_bin_dir%") do set erts_bin_dir=%%~se
 @goto :eof
-