diff --git a/CMakeLists.txt b/CMakeLists.txt
index 6f1eaa0..dcc416f 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -147,14 +147,12 @@ ENDIF()
 # Installation
 IF (WIN32)
     INSTALL(TARGETS pgagent DESTINATION .)
-    INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION .)
 ELSE(WIN32)
     INSTALL(TARGETS pgagent DESTINATION bin)
-    INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
 ENDIF(WIN32)
 
-INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION .)
-INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION .)
+INSTALL(FILES ${pgagent_SOURCE_DIR}/README DESTINATION share/pgagent/)
+INSTALL(FILES ${pgagent_SOURCE_DIR}/LICENSE DESTINATION share/pgagent/)
 
 # Extension
 IF(PG_EXTENSION)
@@ -168,6 +166,12 @@ IF(PG_EXTENSION)
     FILE(GLOB SQL "${CMAKE_CURRENT_SOURCE_DIR}/sql/*--*.sql")
     FILE(GLOB CONTROL "${CMAKE_CURRENT_SOURCE_DIR}/*.control")
     INSTALL(FILES ${CMAKE_BINARY_DIR}/pgagent.control ${CONTROL} ${SQL} DESTINATION ${PG_SHARE_DIR}/extension)
+ELSE(PG_EXTENSION)
+	IF (WIN32)
+		INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION .)
+	ELSE(WIN32)
+		INSTALL(FILES ${pgagent_SOURCE_DIR}/sql/pgagent.sql DESTINATION share)
+	ENDIF(WIN32)
 ENDIF(PG_EXTENSION)
 
 ################################################################################