diff --git a/ports/mpir/CONTROL b/ports/mpir/CONTROL
index 6d8646f93e..0a1f1601ba 100644
--- a/ports/mpir/CONTROL
+++ b/ports/mpir/CONTROL
@@ -1,3 +1,3 @@
-Source: mpir
-Version: 2.7.2
+Source: mpir
+Version: 2.7.2-1
 Description: Multiple Precision Integers and Rationals.
\ No newline at end of file
diff --git a/ports/mpir/portfile.cmake b/ports/mpir/portfile.cmake
index a3a704407a..a57c53328a 100644
--- a/ports/mpir/portfile.cmake
+++ b/ports/mpir/portfile.cmake
@@ -1,53 +1,73 @@
-if (VCPKG_LIBRARY_LINKAGE STREQUAL static)
-    message(STATUS "Warning: Static building not supported yet. Building dynamic.")
-    set(VCPKG_LIBRARY_LINKAGE dynamic)
-endif()
-include(vcpkg_common_functions)
-set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2)
-vcpkg_download_distfile(ARCHIVE_FILE
-    URLS "http://mpir.org/mpir-2.7.2.tar.lz"
-    FILENAME "mpir-2.7.2.tar.lz"
-    SHA512 2635c167ddbba99364ec741373768e0675d34f94fad8912d5433b95e6fbfdb0510f5e94a707acc42048254bc658c52c6671bb0c0dac31267c4b82b00c3e74efa
-)
-vcpkg_extract_source_archive(${ARCHIVE_FILE})
-
-vcpkg_build_msbuild(
-    PROJECT_PATH ${SOURCE_PATH}/build.vc14/dll_mpir_gc/dll_mpir_gc.vcxproj
-)
-
-IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
-	SET(BUILD_ARCH "Win32")
-ELSE()
-	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
-ENDIF()
-
-file(INSTALL
-	${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/gmp.h
-	${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/gmpxx.h
-	${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.h
-	${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpirxx.h
-    DESTINATION ${CURRENT_PACKAGES_DIR}/include
-)
-file(INSTALL
-    ${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.dll
-	${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.pdb
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
-)
-file(INSTALL
-    ${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.dll
-	${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.pdb
-    DESTINATION ${CURRENT_PACKAGES_DIR}/bin
-)
-file(INSTALL
-    ${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
-)
-file(INSTALL
-    ${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.lib
-    DESTINATION ${CURRENT_PACKAGES_DIR}/lib
-)
-
-file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpir RENAME copyright)
-
-vcpkg_copy_pdbs()
-message(STATUS "Installing done")
+include(vcpkg_common_functions)
+set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/mpir-2.7.2)
+vcpkg_download_distfile(ARCHIVE_FILE
+    URLS "http://mpir.org/mpir-2.7.2.tar.bz2"
+    FILENAME "mpir-2.7.2.tar.bz2"
+    SHA512 8436a0123201f9e30130ea340331c5a6445dddb58ce1f6c6a3a8303c310ac5b3c279c83b5c520a757cba82c2b14e92da44583e0eec287090cf69cbb29d516a9c
+)
+vcpkg_extract_source_archive(${ARCHIVE_FILE})
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+	vcpkg_build_msbuild(
+		PROJECT_PATH ${SOURCE_PATH}/build.vc14/dll_mpir_gc/dll_mpir_gc.vcxproj
+	)
+else()
+	vcpkg_build_msbuild(
+		PROJECT_PATH ${SOURCE_PATH}/build.vc14/lib_mpir_gc/lib_mpir_gc.vcxproj
+	)
+endif()
+
+IF (TRIPLET_SYSTEM_ARCH MATCHES "x86")
+	SET(BUILD_ARCH "Win32")
+ELSE()
+	SET(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH})
+ENDIF()
+
+if (VCPKG_LIBRARY_LINKAGE STREQUAL "dynamic")
+	file(INSTALL
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/gmp.h
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/gmpxx.h
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.h
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpirxx.h
+		DESTINATION ${CURRENT_PACKAGES_DIR}/include
+	)
+	file(INSTALL
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.dll
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.pdb
+		DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin
+	)
+	file(INSTALL
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.dll
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.pdb
+		DESTINATION ${CURRENT_PACKAGES_DIR}/bin
+	)
+	file(INSTALL
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Debug/mpir.lib
+		DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+	)
+	file(INSTALL
+		${SOURCE_PATH}/dll/${BUILD_ARCH}/Release/mpir.lib
+		DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+	)
+	file(INSTALL ${SOURCE_PATH}/COPYING.lib DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpir RENAME copyright)
+	vcpkg_copy_pdbs()
+else()
+	file(INSTALL
+		${SOURCE_PATH}/lib/${BUILD_ARCH}/Debug/gmp.h
+		${SOURCE_PATH}/lib/${BUILD_ARCH}/Debug/gmpxx.h
+		${SOURCE_PATH}/lib/${BUILD_ARCH}/Debug/mpir.h
+		${SOURCE_PATH}/lib/${BUILD_ARCH}/Debug/mpirxx.h
+		DESTINATION ${CURRENT_PACKAGES_DIR}/include
+	)
+	file(INSTALL
+		${SOURCE_PATH}/lib/${BUILD_ARCH}/Debug/mpir.lib
+		DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib
+	)
+	file(INSTALL
+		${SOURCE_PATH}/lib/${BUILD_ARCH}/Release/mpir.lib
+		DESTINATION ${CURRENT_PACKAGES_DIR}/lib
+	)
+	file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/mpir RENAME copyright)
+endif()
+
+message(STATUS "Installing done")