diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8505371..a804a8d 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,20 +1,25 @@
-# CMakeLists.txt
-cmake_minimum_required (VERSION 3.5.1)
-project (gpmf-writer)
-
-set(CMAKE_SUPPRESS_REGENERATION true)
-set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
-
-file(GLOB SOURCES *.c *.h "demo/*.c" "demo/*.h")
-
-add_executable(gpmf-writer ${SOURCES})
-
-
-file(GLOB HEADERS *.h)
-file(GLOB CFILES *.c)
-
-install(FILES ${HEADERS} DESTINATION include/gpmf-write)
-
-add_library(gpmf-write SHARED ${HEADERS} ${CFILES})
-set_property(TARGET gpmf-write PROPERTY SOVERSION 1)
-install(TARGETS gpmf-write DESTINATION lib)
+cmake_minimum_required(VERSION 3.5.1)
+project(gpmf-writer)
+
+set(CMAKE_SUPPRESS_REGENERATION true)
+set(CMAKE_CONFIGURATION_TYPES "Debug;Release")
+
+file(GLOB HEADERS "*.h")
+file(GLOB DEMO_HEADERS "demo/*.h")
+file(GLOB LIB_SOURCES "*.c" "demo/GPMF_mp4writer.c" "demo/GPMF_parser.c")
+file(GLOB SOURCES ${LIB_SOURCES} "demo/GPMF_demo.c" "demo/GPMF_print.c")
+
+add_executable(GPMF_WRITER_BIN ${SOURCES} ${HEADERS})
+set_target_properties(GPMF_WRITER_BIN PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
+add_library(GPMF_WRITER_LIB ${LIB_SOURCES})
+set_target_properties(GPMF_WRITER_LIB PROPERTIES OUTPUT_NAME "${PROJECT_NAME}")
+set_property(TARGET GPMF_WRITER_LIB PROPERTY SOVERSION 1)
+
+set(PC_LINK_FLAGS "-l${PROJECT_NAME}")
+configure_file("${PROJECT_NAME}.pc.in" "${PROJECT_NAME}.pc" @ONLY)
+
+install(FILES ${HEADERS} DESTINATION "include/gpmf-writer")
+install(FILES ${DEMO_HEADERS} DESTINATION "include/gpmf-writer/demo")
+install(TARGETS GPMF_WRITER_BIN DESTINATION "bin")
+install(TARGETS GPMF_WRITER_LIB DESTINATION "lib")
+install(FILES "${PROJECT_NAME}.pc" DESTINATION "lib/pkgconfig")
diff --git a/gpmf-writer.pc.in b/gpmf-writer.pc.in
new file mode 100644
index 0000000..36b5863
--- /dev/null
+++ b/gpmf-writer.pc.in
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/lib
+includedir=${prefix}/include/@PROJECT_NAME@
+
+Name: @PROJECT_NAME@
+Description: A low level GPMF writer
+Version: 1.1.0
+Libs: -L${libdir} @PC_LINK_FLAGS@
+Cflags: -I${includedir} -I${includedir}/demo