diff --git a/.VERSION b/.VERSION
deleted file mode 100644
index d169b2f2..00000000
--- a/.VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.0.8
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 68963033..95ffe601 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -105,34 +105,37 @@ if (BUILD_TESTING)
   add_subdirectory(benchmark)
 endif(BUILD_TESTING)
 
-#####################
 
-configure_file(${CMAKE_SOURCE_DIR}/.VERSION.in ${CMAKE_BINARY_DIR}/.VERSION)
+###################
+# pkgconfig stuff
+configure_file(${CMAKE_SOURCE_DIR}/VERSION.in
+               ${CMAKE_BINARY_DIR}/VERSION)
+configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hpcombi.pc.in
+               ${CMAKE_CURRENT_BINARY_DIR}/hpcombi.pc @ONLY)
 
 ####################
 # Installation
 
-set(install_misc README.md LICENSE list_intrin.txt)
+set(install_misc README.md LICENSE)
 foreach(f ${install_misc})
   install (FILES ${CMAKE_SOURCE_DIR}/${f}
-    DESTINATION share/${CMAKE_PROJECT_NAME})
+  DESTINATION share/${CMAKE_PROJECT_NAME})
 endforeach(f)
 
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/.VERSION DESTINATION ".")
-
 install (
-  DIRECTORY ${CMAKE_SOURCE_DIR}/include/
-  DESTINATION include/${CMAKE_PROJECT_NAME}
-  FILES_MATCHING PATTERN "*.hpp")
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/VERSION
+  DESTINATION share/${CMAKE_PROJECT_NAME})
 install (
-  DIRECTORY ${CMAKE_SOURCE_DIR}/third_party/
-  DESTINATION third_party/${CMAKE_PROJECT_NAME}
+  DIRECTORY ${CMAKE_SOURCE_DIR}/include/hpcombi
+  DESTINATION include
   FILES_MATCHING PATTERN "*.hpp")
+install (
+  DIRECTORY ${CMAKE_SOURCE_DIR}/third_party/simde
+  DESTINATION include/${CMAKE_PROJECT_NAME})
 
-###################
-# pkgconfig stuff
-# configure_file(${CMAKE_CURRENT_SOURCE_DIR}/hpcombi.pc.in
-#                ${CMAKE_CURRENT_BINARY_DIR}/hpcombi.pc @ONLY)
+install (
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/hpcombi.pc
+  DESTINATION pkg-config)
 
 #################
 # Packing stuff
diff --git a/.VERSION.in b/VERSION.in
similarity index 100%
rename from .VERSION.in
rename to VERSION.in
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
index 8049284d..b48e8279 100644
--- a/doc/CMakeLists.txt
+++ b/doc/CMakeLists.txt
@@ -28,7 +28,7 @@ else()
      COMMAND ${CMAKE_COMMAND} -E echo "Done."
      )
 
-  install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
-          DESTINATION doc/${CMAKE_PROJECT_NAME})
+#  install(DIRECTORY ${CMAKE_BINARY_DIR}/doc/html
+#          DESTINATION doc/${CMAKE_PROJECT_NAME})
 
 endif()