diff --git a/ports/ccfits/CONTROL b/ports/ccfits/CONTROL
deleted file mode 100644
index 4fbc3ad809..0000000000
--- a/ports/ccfits/CONTROL
+++ /dev/null
@@ -1,6 +0,0 @@
-Source: ccfits
-Version: 2.5
-Port-Version: 6
-Homepage: https://heasarc.gsfc.nasa.gov/fitsio/ccfits
-Description: CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.
-Build-Depends: cfitsio
diff --git a/ports/ccfits/portfile.cmake b/ports/ccfits/portfile.cmake
index 2071e4af85..e187604013 100644
--- a/ports/ccfits/portfile.cmake
+++ b/ports/ccfits/portfile.cmake
@@ -39,5 +39,9 @@ foreach(HEADER IN LISTS HEADERS)
     file(WRITE "${HEADER}" "${_contents}")
 endforeach()
 
+vcpkg_replace_string(${CURRENT_PACKAGES_DIR}/include/CCfits/CCfits.h
+    "#include \"longnam.h\"" "#include \"cfitsio/longnam.h\""
+)
+
 # Handle copyright
 file(INSTALL ${SOURCE_PATH}/License.txt DESTINATION ${CURRENT_PACKAGES_DIR}/share/${PORT} RENAME copyright)
diff --git a/ports/ccfits/vcpkg.json b/ports/ccfits/vcpkg.json
new file mode 100644
index 0000000000..d8280a1581
--- /dev/null
+++ b/ports/ccfits/vcpkg.json
@@ -0,0 +1,10 @@
+{
+  "name": "ccfits",
+  "version": "2.5",
+  "port-version": 7,
+  "description": "CCfits is an object oriented interface to the cfitsio library. It is designed to make the capabilities of cfitsio available to programmers working in C++.",
+  "homepage": "https://heasarc.gsfc.nasa.gov/fitsio/ccfits",
+  "dependencies": [
+    "cfitsio"
+  ]
+}
diff --git a/versions/baseline.json b/versions/baseline.json
index 5a96b9aa61..a590b45be7 100644
--- a/versions/baseline.json
+++ b/versions/baseline.json
@@ -1154,7 +1154,7 @@
     },
     "ccfits": {
       "baseline": "2.5",
-      "port-version": 6
+      "port-version": 7
     },
     "cctz": {
       "baseline": "2.3-2",
diff --git a/versions/c-/ccfits.json b/versions/c-/ccfits.json
index a1a5ba6049..d7b390aa76 100644
--- a/versions/c-/ccfits.json
+++ b/versions/c-/ccfits.json
@@ -1,5 +1,10 @@
 {
   "versions": [
+    {
+      "git-tree": "adb43da4a1d72e0924081e4699d81337d649400e",
+      "version": "2.5",
+      "port-version": 7
+    },
     {
       "git-tree": "c72b341528629e93108ce5317dd3802dc9b4ac11",
       "version-string": "2.5",