diff --git a/ports/libaaplus/fix-cmakelists.patch b/ports/libaaplus/fix-cmakelists.patch
index a57e05b3b4969d..f51d326fa0b1f8 100644
--- a/ports/libaaplus/fix-cmakelists.patch
+++ b/ports/libaaplus/fix-cmakelists.patch
@@ -1,85 +1,85 @@
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9bb8ea3..c445c4b 100644
+index 2ec70d9..8083fb1 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -5,6 +5,7 @@ cmake_minimum_required(VERSION 3.8)
- SET(CMAKE_CXX_STANDARD 17)
- SET(CMAKE_CXX_STANDARD_REQUIRED ON)
- 
-+option(BUILD_TOOLS "Build libaaplus tools" OFF)
- #-----------------------------------------------------------------------------
- # Output directories.
- SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH
-@@ -261,18 +262,66 @@ SET ( SRCS
- #-----------------------------------------------------------------------------
- # Executables.
- #-----------------------------------------------------------------------------
-+if(BUILD_TOOLS)
- ADD_EXECUTABLE(AATest ${SRCS} )
--
-+endif()
- #-----------------------------------------------------------------------------
- # Libraries.
-+if(NOT BUILD_SHARED_LIBS)
- ADD_LIBRARY(aaplus-static STATIC ${SRCS_LIB} ${INCS})
- SET_TARGET_PROPERTIES(aaplus-static PROPERTIES OUTPUT_NAME "aaplus")
--
-+target_include_directories(aaplus-static PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/aaplus>)
-+else()
- ADD_LIBRARY(aaplus-shared SHARED ${SRCS_LIB} ${INCS})
- SET_TARGET_PROPERTIES(aaplus-shared PROPERTIES OUTPUT_NAME "aaplus")
-+target_include_directories(aaplus-shared PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/aaplus>)
-+endif()
-+
-+if (MSVC AND BUILD_SHARED_LIBS)
-+target_compile_definitions(aaplus-shared
-+    PRIVATE
-+        -DAAPLUS_EXT_CLASS\=__declspec\(dllexport\)
-+)
-+endif (MSVC AND BUILD_SHARED_LIBS)
-+
-+if(BUILD_SHARED_LIBS)
-+    install(
-+        TARGETS aaplus-shared
-+        EXPORT aaplus
-+        ARCHIVE DESTINATION lib
-+        LIBRARY DESTINATION lib
-+        RUNTIME DESTINATION bin
-+    )
-+else()
-+    install(
-+        TARGETS aaplus-static
-+        EXPORT aaplus
-+        ARCHIVE DESTINATION lib
-+        LIBRARY DESTINATION lib
-+        RUNTIME DESTINATION bin
-+    )
-+endif()
- 
--install(TARGETS aaplus-shared aaplus-static 
--		DESTINATION "${CMAKE_INSTALL_PREFIX}/lib" )
-+if(BUILD_TOOLS)
-+    if(BUILD_SHARED_LIBS)
-+        TARGET_LINK_LIBRARIES(AATest aaplus-shared)
-+        if(MSVC)
-+            target_compile_definitions(AATest
-+                PUBLIC
-+                -DAAPLUS_EXT_CLASS\=__declspec\(dllimport\)
-+        )
-+        endif()
-+        
-+    else()
-+        TARGET_LINK_LIBRARIES(AATest aaplus-static)
-+    endif()    
-+endif()
- 
--TARGET_LINK_LIBRARIES(AATest aaplus-static)
-+install(
-+    EXPORT aaplus
-+    DESTINATION share/aaplus
-+    FILE aaplusConfig.cmake
-+    NAMESPACE aaplus::
-+)
- 
-+install(FILES ${INCS} DESTINATION include/aaplus)
-\ No newline at end of file
+@@ -9,6 +9,8 @@ SET(CMAKE_CXX_STANDARD_REQUIRED ON)
+ SET(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin CACHE PATH "Single output directory for building all executables.")
+ SET(LIBRARY_OUTPUT_PATH ${PROJECT_BINARY_DIR}/lib CACHE PATH "Single output directory for building all libraries.")
+ 
++option(BUILD_TOOLS "Build libaaplus tools" OFF)
++
+ configure_file(AA+.h.in AA+.h)
+ 
+ SET ( SRCS_LIB
+@@ -254,21 +256,64 @@ SET ( INCS
+ SET ( SRCS
+   AATest.cpp
+ )
+-
++if(BUILD_TOOLS)
+ ADD_EXECUTABLE(AATest ${SRCS} )
+-
++endif()
++if(NOT BUILD_SHARED_LIBS)
+ ADD_LIBRARY(aaplus-static STATIC ${SRCS_LIB} ${INCS})
+ SET_TARGET_PROPERTIES(aaplus-static PROPERTIES OUTPUT_NAME "aaplus")
+-
++target_include_directories(aaplus-static PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/aaplus>)
++else()
+ ADD_LIBRARY(aaplus-shared SHARED ${SRCS_LIB} ${INCS})
+ SET_TARGET_PROPERTIES(aaplus-shared PROPERTIES OUTPUT_NAME "aaplus")
++target_include_directories(aaplus-shared PUBLIC $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}> $<INSTALL_INTERFACE:include/aaplus>)
++endif()
+ 
+-include_directories(${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_SOURCE_DIR})
+-
+-install(TARGETS aaplus-shared aaplus-static DESTINATION "${CMAKE_INSTALL_PREFIX}/lib")
++if (MSVC AND BUILD_SHARED_LIBS)
++target_compile_definitions(aaplus-shared
++    PRIVATE
++        -DAAPLUS_EXT_CLASS\=__declspec\(dllexport\)
++)
++endif (MSVC AND BUILD_SHARED_LIBS)
+ 
+-TARGET_LINK_LIBRARIES(AATest aaplus-static)
++if(BUILD_SHARED_LIBS)
++    install(
++        TARGETS aaplus-shared
++        EXPORT aaplus
++        ARCHIVE DESTINATION lib
++        LIBRARY DESTINATION lib
++        RUNTIME DESTINATION bin
++    )
++else()
++    install(
++        TARGETS aaplus-static
++        EXPORT aaplus
++        ARCHIVE DESTINATION lib
++        LIBRARY DESTINATION lib
++        RUNTIME DESTINATION bin
++    )
++endif()
+ 
++if(BUILD_TOOLS)
++    if(BUILD_SHARED_LIBS)
++        TARGET_LINK_LIBRARIES(AATest aaplus-shared)
++        if(MSVC)
++            target_compile_definitions(AATest
++                PUBLIC
++                -DAAPLUS_EXT_CLASS\=__declspec\(dllimport\)
++        )
++        endif()
++    else()
++        TARGET_LINK_LIBRARIES(AATest aaplus-static)
++    endif() 
++endif()
++install(
++    EXPORT aaplus
++    DESTINATION share/aaplus
++    FILE aaplusConfig.cmake
++    NAMESPACE aaplus::
++)
++install(FILES ${INCS} DESTINATION include/aaplus)
+ set(CPACK_PACKAGE_NAME "aaplus")
+ set(CPACK_PACKAGE_VENDOR "Naughter Software")
+ set(CPACK_PACKAGE_VERSION "${AAPLUS_VERSION}")
diff --git a/ports/libaaplus/portfile.cmake b/ports/libaaplus/portfile.cmake
index 0d88d1df5932aa..de408dc8b4a337 100644
--- a/ports/libaaplus/portfile.cmake
+++ b/ports/libaaplus/portfile.cmake
@@ -1,10 +1,8 @@
-set(VERSION 2.36)
-
 vcpkg_download_distfile(
     ARCHIVE_FILE
     URLS "http://www.naughter.com/download/aaplus_v${VERSION}.zip"
     FILENAME "aaplus_v${VERSION}.zip"
-    SHA512 a7abf20feb49df00b95be987809a3dc8df3e9ff706dd5a873ecfdd695af125f858264e092b6b856e83685e9eb46fd46520cf09dfae892c32cbb71f925ba17b86
+    SHA512 d3a134f5d4be3e1652798c7d1fec2addcf07efb631e2c681ea40553a53a56615552f71bd5b123903ad849a2959c117cc9f7fe3a1d335c613ea14f931407107d6
 )
 
 vcpkg_extract_source_archive(
@@ -34,4 +32,4 @@ vcpkg_cmake_config_fixup(PACKAGE_NAME aaplus CONFIG_PATH share/aaplus)
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
 file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")
 
-file(INSTALL "${SOURCE_PATH}/AA+.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
\ No newline at end of file
+file(INSTALL "${SOURCE_PATH}/AA+.htm" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
diff --git a/ports/libaaplus/vcpkg.json b/ports/libaaplus/vcpkg.json
index 2282eba6ce18e7..6efc8b4907fbc4 100644
--- a/ports/libaaplus/vcpkg.json
+++ b/ports/libaaplus/vcpkg.json
@@ -1,7 +1,6 @@
 {
   "name": "libaaplus",
-  "version": "2.36",
-  "port-version": 1,
+  "version": "2.70",
   "description": "libaaplus is an astronomical computations library by naughter software",
   "homepage": "http://www.naughter.com/aa.html",
   "dependencies": [
diff --git a/versions/baseline.json b/versions/baseline.json
index 6f090fd869f408..1415a27a4fa4ae 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -4645,8 +4645,8 @@
       "port-version": 1
     },
     "libaaplus": {
-      "baseline": "2.36",
-      "port-version": 1
+      "baseline": "2.70",
+      "port-version": 0
     },
     "libadlmidi": {
       "baseline": "2025-04-14",
diff --git a/versions/l-/libaaplus.json b/versions/l-/libaaplus.json
index cc3fae04ad79bb..acc4dc6a47b319 100644
--- a/versions/l-/libaaplus.json
+++ b/versions/l-/libaaplus.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "c051197f979bb3ca5934664c780fab20b8cf8d54",
+      "version": "2.70",
+      "port-version": 0
+    },
     {
       "git-tree": "2254865f7618bb8f116d18156b41d307d32b0a6d",
       "version": "2.36",