diff --git a/angles/CHANGELOG.rst b/angles/CHANGELOG.rst
index 1211492..839ffd3 100644
--- a/angles/CHANGELOG.rst
+++ b/angles/CHANGELOG.rst
@@ -2,6 +2,17 @@
 Changelog for package angles
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.12.6 (2022-07-12)
+-------------------
+* Correct version in Python setup.py
+* Contributors: Geoffrey Biggs
+
+1.12.5 (2022-07-10)
+-------------------
+* ROS 2 Python Port (`#37 <https://github.com/ros/angles/issues/37>`_)
+* Fix M_PI on Windows (`#34 <https://github.com/ros/angles/issues/34>`_) (`#35 <https://github.com/ros/angles/issues/35>`_)
+* Contributors: David V. Lu!!, Akash
+
 1.12.4 (2021-03-18)
 -------------------
 * Upgrade to setuptools (`#23 <https://github.com/ros/angles/issues/23>`_)
diff --git a/angles/CMakeLists.txt b/angles/CMakeLists.txt
index 37dd3ed..a5ee93c 100644
--- a/angles/CMakeLists.txt
+++ b/angles/CMakeLists.txt
@@ -21,4 +21,6 @@ include_directories(include)
 
 ament_export_include_directories(include)
 
+ament_python_install_package(${PROJECT_NAME})
+
 ament_package()
diff --git a/angles/src/angles/__init__.py b/angles/angles/__init__.py
similarity index 100%
rename from angles/src/angles/__init__.py
rename to angles/angles/__init__.py
diff --git a/angles/include/angles/angles.h b/angles/include/angles/angles.h
index d2d9666..ff7d74a 100644
--- a/angles/include/angles/angles.h
+++ b/angles/include/angles/angles.h
@@ -35,6 +35,7 @@
 #ifndef GEOMETRY_ANGLES_UTILS_H
 #define GEOMETRY_ANGLES_UTILS_H
 
+#define _USE_MATH_DEFINES
 #include <algorithm>
 #include <cmath>
 
diff --git a/angles/package.xml b/angles/package.xml
index 0f7be27..02935b8 100644
--- a/angles/package.xml
+++ b/angles/package.xml
@@ -4,7 +4,7 @@
   schematypens="http://www.w3.org/2001/XMLSchema"?>
 <package format="3">
   <name>angles</name>
-  <version>1.12.4</version>
+  <version>1.12.6</version>
   <description>This package provides a set of simple math utilities to work
         with angles. The utilities cover simple things like
         normalizing an angle and conversion between degrees and
@@ -21,6 +21,7 @@
   <url>http://wiki.ros.org/angles</url>
 
   <buildtool_depend>ament_cmake</buildtool_depend>
+  <buildtool_depend>ament_cmake_python</buildtool_depend>
   <buildtool_depend>python3-setuptools</buildtool_depend>
 
   <export>
diff --git a/angles/setup.py b/angles/setup.py
index 7e42a3a..294a1b8 100644
--- a/angles/setup.py
+++ b/angles/setup.py
@@ -1,11 +1,20 @@
-#!/usr/bin/env python
-
 from setuptools import setup
-from catkin_pkg.python_setup import generate_distutils_setup
 
-package_info = generate_distutils_setup(
-    packages=['angles'],
-    package_dir={'': 'src'}
-)
+package_name = 'angles'
 
-setup(**package_info)
+setup(
+    name=package_name,
+    version='1.12.6',
+    package_dir={'': 'src'},
+    packages=[package_name],
+    data_files=[
+        ('share/ament_index/resource_index/packages', ['resource/' + package_name]),
+        ('share/' + package_name, ['package.xml']),
+    ],
+    install_requires=['setuptools'],
+    url='http://wiki.ros.org/angles',
+    license='BSD',
+    author='John Hsu',
+    author_email='hsu@osrfoundation.org',
+    description='Simple math utilities to work with angles',
+)
diff --git a/angles/test/utest.py b/angles/test/utest.py
index 13b6a41..24631ad 100644
--- a/angles/test/utest.py
+++ b/angles/test/utest.py
@@ -304,5 +304,4 @@ def test_find_min_max_delta(self):
          self.assertAlmostEqual(max_delta, 3*pi/4)
 
 if __name__ == '__main__':
-    import rosunit
-    rosunit.unitrun('angles', 'test_python_angles', TestAngles)
+    unittest.main()