diff -rupN cfitsio-3.47/cfitsio.pc.cmake cfitsio-3.47-new/cfitsio.pc.cmake
--- cfitsio-3.47/cfitsio.pc.cmake	2019-05-08 17:34:49.000000000 +0200
+++ cfitsio-3.47-new/cfitsio.pc.cmake	2019-09-16 23:40:21.316478014 +0200
@@ -1,12 +1,12 @@
 prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
-libdir=@PKG_CONFIG_LIBDIR@
+libdir=@CMAKE_INSTALL_LIBDIR@
 includedir=@INCLUDE_INSTALL_DIR@
 
 Name: cfitsio
 Description: FITS File Subroutine Library
 URL: https://heasarc.gsfc.nasa.gov/fitsio/
 Version: @CFITSIO_MAJOR@.@CFITSIO_MINOR@
-Libs: -L${libdir} @PKG_CONFIG_LIBS@
-Libs.private: -lm
+Libs: -L${libdir} -lcfitsio
+Libs.private: -lm -lz
 Cflags: -I${includedir}
diff -rupN cfitsio-3.47/CMakeLists.txt cfitsio-3.47-new/CMakeLists.txt
--- cfitsio-3.47/CMakeLists.txt	2019-05-08 17:34:49.000000000 +0200
+++ cfitsio-3.47-new/CMakeLists.txt	2019-09-16 23:32:45.871907834 +0200
@@ -21,7 +21,7 @@ OPTION (USE_PTHREADS "Thread-safe build
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}")
 set (LIB_DESTINATION "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}")
-set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/")
+set (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include/cfitsio")
 
 # Define project version
 SET(${PROJECT_NAME}_MAJOR_VERSION 3)
@@ -121,21 +121,14 @@ SET(SRC_FILES
 # drvrgsiftp.c is only usable if HAVE_NET_SERVICES & HAVE_GSIFTP are defined:
 #drvrgsiftp.c
 
-# Only include zlib source files if we are building a shared library.
-# Users will need to link their executable with zlib independently.
-IF (BUILD_SHARED_LIBS)
-    set(SRC_FILES ${SRC_FILES}
-        zlib/adler32.c zlib/crc32.c zlib/deflate.c zlib/infback.c
-        zlib/inffast.c zlib/inflate.c zlib/inftrees.c zlib/trees.c
-        zlib/uncompr.c zlib/zutil.c
-        )
-ENDIF()
 
 ADD_LIBRARY(${LIB_NAME} ${LIB_TYPE} ${H_FILES} ${SRC_FILES})
-TARGET_LINK_LIBRARIES(${LIB_NAME} ${PTHREADS_LIBRARY} ${M_LIB} ${CURL_LIBRARIES})
+TARGET_LINK_LIBRARIES(${LIB_NAME} ${PTHREADS_LIBRARY} ${M_LIB} ${CURL_LIBRARIES} -lz)
 
 SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES VERSION ${${PROJECT_NAME}_VERSION} SOVERSION ${${PROJECT_NAME}_MAJOR_VERSION})
-install(TARGETS ${LIB_NAME} DESTINATION ${LIB_DESTINATION})
+IF(WIN32)
+    SET_TARGET_PROPERTIES(${LIB_NAME} PROPERTIES SUFFIX "-${${PROJECT_NAME}_MAJOR_VERSION}${CMAKE_SHARED_LIBRARY_SUFFIX}")
+ENDIF(WIN32)
 install(TARGETS ${LIB_NAME}
                             RUNTIME DESTINATION bin
                             LIBRARY DESTINATION lib
@@ -160,9 +153,11 @@ IF (BUILD_SHARED_LIBS)
 
     ADD_EXECUTABLE(FPack fpack.c fpackutil.c)
     TARGET_LINK_LIBRARIES(FPack ${LIB_NAME})
+    INSTALL(TARGETS FPack DESTINATION bin)
 
     ADD_EXECUTABLE(Funpack funpack.c fpackutil.c)
     TARGET_LINK_LIBRARIES(Funpack ${LIB_NAME})
+    INSTALL(TARGETS Funpack DESTINATION bin)
 
     ADD_EXECUTABLE(Fitscopy fitscopy.c)
     TARGET_LINK_LIBRARIES(Fitscopy ${LIB_NAME})