diff --git a/CMakeLists.txt b/CMakeLists.txt
index 42debfb8..16907785 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -432,8 +432,13 @@ endif ( enable-oss )
 
 unset ( MIDISHARE_SUPPORT CACHE )
 if ( enable-midishare )
-  find_package ( MidiShare )
+  find_package ( MidiShare QUIET )
   set ( MIDISHARE_SUPPORT ${MidiShare_FOUND} )
+  if ( MidiShare_FOUND )
+    set ( MidiShare_LIBS ${MidiShare_LIBRARIES} )
+  else ( MidiShare_FOUND )
+    unset ( MidiShare_LIBS CACHE )
+  endif ( MidiShare_FOUND )
 else ( enable-midishare )
   unset ( MidiShare_LIBS CACHE )
 endif ( enable-midishare )
diff --git a/cmake_admin/FindMidiShare.cmake b/cmake_admin/FindMidiShare.cmake
index 06f56e6f..ae625d1a 100644
--- a/cmake_admin/FindMidiShare.cmake
+++ b/cmake_admin/FindMidiShare.cmake
@@ -1,18 +1,18 @@
 # Try to find the READLINE library
 #  MidiShare_FOUND - system has MidiShare
 #  MidiShare_INCLUDE_DIR - MidiShare include directory
-#  MidiShare_LIBS - Libraries needed to use MidiShare
+#  MidiShare_LIBRARIES - Libraries needed to use MidiShare
 
-if ( MidiShare_INCLUDE_DIR AND MidiShare_LIBS )
+if ( MidiShare_INCLUDE_DIR AND MidiShare_LIBRARIES )
     set ( MidiShare_FIND_QUIETLY TRUE )
-endif ( MidiShare_INCLUDE_DIR AND MidiShare_LIBS )
+endif ( MidiShare_INCLUDE_DIR AND MidiShare_LIBRARIES )
 
 find_path ( MidiShare_INCLUDE_DIR NAMES MidiShare.h )
-find_library ( MidiShare_LIBS NAMES MidiShare )
+find_library ( MidiShare_LIBRARIES NAMES MidiShare )
 
 include ( FindPackageHandleStandardArgs )
 find_package_handle_standard_args( MidiShare DEFAULT_MSG 
                                    MidiShare_INCLUDE_DIR 
-                                   MidiShare_LIBS )
+                                   MidiShare_LIBRARIES )
 
-mark_as_advanced( MidiShare_INCLUDE_DIR MidiShare_LIBS )
+mark_as_advanced( MidiShare_INCLUDE_DIR MidiShare_LIBRARIES )