diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6e56b0045a..967263434e 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-project (mavlink NONE)
+project (mavlink)
 
 # settings
 cmake_minimum_required (VERSION 2.8.2)
@@ -35,6 +35,12 @@ include(CheckLibraryExists)
 #include(CheckCSourceCompiles)
 include(ExternalProjectWithFilename)
 
+if (UNIX)
+    include(GNUInstallDirs)
+    set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries")
+endif ()
+
+
 # spawn new cmake to build deps
 if (WITH_BUILD_DEPS AND ROOT_THREAD)
     execute_process(COMMAND ${CMAKE_COMMAND} "${CMAKE_SOURCE_DIR}"
@@ -165,12 +171,16 @@ endif()
 install(DIRECTORY ${CMAKE_BINARY_DIR}/include/ DESTINATION include/${PROJECT_NAME} COMPONENT Dev FILES_MATCHING PATTERN "*.h*")
 install(DIRECTORY ${CMAKE_BINARY_DIR}/src/ DESTINATION share/${PROJECT_NAME} COMPONENT Dev FILES_MATCHING PATTERN "*.c*")
 install(DIRECTORY ${CMAKE_SOURCE_DIR}/share/${PROJECT_NAME} DESTINATION share COMPONENT Dev FILES_MATCHING PATTERN "*.c*")
-install(DIRECTORY ${CMAKE_SOURCE_DIR}/pymavlink DESTINATION "share/pyshared" COMPONENT Dev)
+if (UNIX)
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/pymavlink DESTINATION ${CMAKE_INSTALL_LIBDIR}/python${PYTHON_VERSION_MAJOR}.${PYTHON_VERSION_MINOR}/site-packages COMPONENT Dev)
+else ()
+    install(DIRECTORY ${CMAKE_SOURCE_DIR}/pymavlink DESTINATION "share/pyshared" COMPONENT Dev)
+endif ()
 
 configure_file(pc.in ${PROJECT_NAME}.pc)
 install(FILES
     ${PROJECT_BINARY_DIR}/${PROJECT_NAME}.pc
-    DESTINATION "lib/pkgconfig" COMPONENT Dev
+    DESTINATION lib${LIB_SUFFIX}/pkgconfig COMPONENT Dev
     )
 
 ### packaging
diff --git a/pc.in b/pc.in
index 98bbb84d0e..e02ba17a65 100644
--- a/pc.in
+++ b/pc.in
@@ -2,6 +2,6 @@ prefix=@CMAKE_INSTALL_PREFIX@
 exec_prefix=@CMAKE_INSTALL_PREFIX@
 
 Name: @PROJECT_NAME@
-Description: @CPACK_PACKAGE_DESCRIPTION_SUMMARY@
-Version: @APPLICATION_VERSION@
+Description: MAVLink micro air vehicle marshalling / communication library
+Version: @PROJECT_VERSION@
 Cflags: -I@CMAKE_INSTALL_PREFIX@/include/@PROJECT_NAME@