diff --git a/cadquery/__init__.py b/cadquery/__init__.py
index 0d18affa2..41a7e7ea6 100644
--- a/cadquery/__init__.py
+++ b/cadquery/__init__.py
@@ -4,7 +4,7 @@
     __version__ = version("cadquery")
 except PackageNotFoundError:
     # package is not installed
-    __version__ = "2.5-dev"
+    __version__ = "2.5.0"
 
 # these items point to the OCC implementation
 from .occ_impl.geom import Plane, BoundBox, Vector, Matrix, Location
diff --git a/changes.md b/changes.md
index 365d4b505..742a6058f 100644
--- a/changes.md
+++ b/changes.md
@@ -1,7 +1,56 @@
 Changes
 =======
 
-2.4.0 (latest release)
+2.5.0 
+------
+
+## Highlights
+* Free-function API https://github.com/CadQuery/cadquery/pull/1731, https://github.com/CadQuery/cadquery/pull/1469, https://github.com/CadQuery/cadquery/pull/1622,
+  https://github.com/CadQuery/cadquery/pull/1672, https://github.com/CadQuery/cadquery/pull/1692, https://github.com/CadQuery/cadquery/pull/1700
+* filter/map/apply/sort/[]/invoke https://github.com/CadQuery/cadquery/pull/1514
+* cq.vis.show improvements https://github.com/CadQuery/cadquery/pull/1726
+
+## Other changes
+* Getting set up for the new 2.5 dev cycle https://github.com/CadQuery/cadquery/pull/1496
+* Fix documentation hole, to many parameter https://github.com/CadQuery/cadquery/pull/1492
+* Add Brep to supported importShape functions https://github.com/CadQuery/cadquery/pull/1467
+* Fixed spelling error of 'visualziation' to 'visualization' https://github.com/CadQuery/cadquery/pull/1510
+* Fix Python version info in pip installation instructions https://github.com/CadQuery/cadquery/pull/1498
+* Updated setup.py for CQ black fork https://github.com/CadQuery/cadquery/pull/1513
+* Fixed gltf export instructions per #1508 https://github.com/CadQuery/cadquery/pull/1523
+* Fix VTK assembly render apply gp_Intrinsic_ZXY rotation https://github.com/CadQuery/cadquery/pull/1540
+* Add cubic and quadratic Bézier curves to Workplane and Sketch https://github.com/CadQuery/cadquery/pull/1529
+* Move DEFAULT_COLOR to vis https://github.com/CadQuery/cadquery/pull/1548
+* radiusArc: due to float looseness the length computation can be sligh… https://github.com/CadQuery/cadquery/pull/1528
+* Add support for 2D and 3D Wire fillet https://github.com/CadQuery/cadquery/pull/1549
+* Fix union with None https://github.com/CadQuery/cadquery/pull/1560
+* Describing the units of the result https://github.com/CadQuery/cadquery/pull/1570
+* Read global element variable at creation time of the promise,… https://github.com/CadQuery/cadquery/pull/1566
+* Fix units in toJSON https://github.com/CadQuery/cadquery/pull/1587
+* Add shape and workplane support to the Workplane.eachpoint() function. Issue #1395 https://github.com/CadQuery/cadquery/pull/1578
+* Fix crash on invalid faces https://github.com/CadQuery/cadquery/pull/1541
+* Fixed font-related test error on some platforms https://github.com/CadQuery/cadquery/pull/1577
+* Add support for closed path fillet to Wire.fillet() https://github.com/CadQuery/cadquery/pull/1573
+* Return False on Vector comparison with non-Vector https://github.com/CadQuery/cadquery/pull/1610
+* Get rid of nptyping https://github.com/CadQuery/cadquery/pull/1617
+* Call SetLocation to set top Assembly Location https://github.com/CadQuery/cadquery/pull/1623
+* sketch offset docs update https://github.com/CadQuery/cadquery/pull/1631
+* fix: Transform order in subassembly https://github.com/CadQuery/cadquery/pull/1629
+* Change Python REPL prompt from "$" to ">>>" https://github.com/CadQuery/cadquery/pull/1647
+* Sketch and Workplane improvements  https://github.com/CadQuery/cadquery/pull/1633
+* Update Wire fillet docstring https://github.com/CadQuery/cadquery/pull/1630
+* Make CadQuery examples browsable in PartCAD https://github.com/CadQuery/cadquery/pull/1669
+* docs: Update install docs to Miniforge https://github.com/CadQuery/cadquery/pull/1682
+* fix: Deduplicate objects with same color on step export https://github.com/CadQuery/cadquery/pull/1690
+* Updated version specification for nlopt to try to resolve issues https://github.com/CadQuery/cadquery/pull/1718
+* doc/quickstart.rst: Emphasis the right lines https://github.com/CadQuery/cadquery/pull/1724
+* Set version in docs automatically from metadata https://github.com/CadQuery/cadquery/pull/1713
+* Fix workplane cylinder center when generated using a custom direction https://github.com/CadQuery/cadquery/pull/1593
+* Header cleanup https://github.com/CadQuery/cadquery/pull/1732
+* Add TypeVar to deprecate_kwarg_name to preserve type information https://github.com/CadQuery/cadquery/pull/1733
+* Docs cleanup https://github.com/CadQuery/cadquery/pull/1736
+
+2.4.0 
 ------
 
 ### Highlights
diff --git a/setup.py b/setup.py
index 4d3e09c23..eaeb16cc0 100644
--- a/setup.py
+++ b/setup.py
@@ -21,7 +21,7 @@
 is_rtd = "READTHEDOCS" in os.environ
 is_appveyor = "APPVEYOR" in os.environ
 is_azure = "CONDA_PY" in os.environ
-is_conda = "CONDA_PREFIX_1" in os.environ
+is_conda = "CONDA_PREFIX" in os.environ
 
 # Only include the installation dependencies if we are not running on RTD or AppVeyor or in a conda env
 if not is_rtd and not is_appveyor and not is_azure and not is_conda:
@@ -38,7 +38,7 @@
 
 setup(
     name="cadquery",
-    version="2.5.0dev",  # Update this for the next release
+    version="2.5.0",  # Update this for the next release
     url="https://github.com/CadQuery/cadquery",
     license="Apache Public License 2.0",
     author="David Cowden",