diff --git a/CMake/CMakeLocations.cmake b/CMake/CMakeLocations.cmake
index 08ba7db..1c47a26 100644
--- a/CMake/CMakeLocations.cmake
+++ b/CMake/CMakeLocations.cmake
@@ -29,7 +29,7 @@
 
 # User's home directory:
 set( HOME $ENV{HOME} )
-  
+set( MODULEDIR $ENV{MODULEDIR} )
 
 set( search_locations
   /usr
@@ -37,6 +37,7 @@ set( search_locations
   /opt
   /opt/local
   /sw
+  ${MODULEDIR}/plplot
   ${HOME}/usr
   CACHE
   PATH
@@ -77,6 +78,7 @@ set( include_locations
   ${HOME}/usr/include
   ${HOME}/include
   ${HOME}/lib/fortran/modules
+  ${MODULEDIR}/plplot
   CACHE
   PATH
   "Directories to look for include files"
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 167aa4d..6451558 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -76,7 +76,9 @@ if( CREATE_SHAREDLIB )
   else( COMPILER_SPECIFIC_LIBS )
     set_target_properties( pg2plplot_shared PROPERTIES OUTPUT_NAME "pg2plplot" )
   endif( COMPILER_SPECIFIC_LIBS )
-  set_target_properties( pg2plplot_shared PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY} )
+  set_target_properties( pg2plplot_shared PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY} SOVERSION 0)
+  execute_process(COMMAND pkg-config --libs plplot-fortran OUTPUT_VARIABLE PKG_LINK OUTPUT_STRIP_TRAILING_WHITESPACE)
+  target_link_libraries( pg2plplot_shared ${PKG_LINK})
 endif( CREATE_SHAREDLIB )
 
 if( CREATE_STATICLIB )
@@ -87,6 +89,7 @@ if( CREATE_STATICLIB )
     set_target_properties( pg2plplot_static PROPERTIES OUTPUT_NAME "pg2plplot" )
   endif( COMPILER_SPECIFIC_LIBS )
   set_target_properties( pg2plplot_static PROPERTIES Fortran_MODULE_DIRECTORY ${MODULE_DIRECTORY} )
+  execute_process(COMMAND pkg-config --cflags plplot-fortran OUTPUT_VARIABLE PKG_FLAGS OUTPUT_STRIP_TRAILING_WHITESPACE)
 endif( CREATE_STATICLIB )