diff --git a/hurricane/cmake_modules/CMakeLists.txt b/hurricane/cmake_modules/CMakeLists.txt
index ca263e1e..759fa0ae 100644
--- a/hurricane/cmake_modules/CMakeLists.txt
+++ b/hurricane/cmake_modules/CMakeLists.txt
@@ -1 +1,2 @@
-install(FILES FindHURRICANE.cmake DESTINATION /share/cmake_modules) 
+install(FILES FindHURRICANE.cmake FindBISON.cmake FindFLEX.cmake
+        DESTINATION /share/cmake_modules) 
diff --git a/hurricane/cmake_modules/FindHURRICANE.cmake b/hurricane/cmake_modules/FindHURRICANE.cmake
index b5e9a15b..262e2dea 100644
--- a/hurricane/cmake_modules/FindHURRICANE.cmake
+++ b/hurricane/cmake_modules/FindHURRICANE.cmake
@@ -37,22 +37,6 @@ IF(UNIX)
     DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}"
   )
 
-  FIND_PATH(HURRICANE_ANALOGIC_INCLUDE_PATH NAMES RdsUnit.h PATHS
-    # Look in other places.
-    ${HURRICANE_DIR_SEARCH}
-    PATH_SUFFIXES include/hurricane
-    # Help the user find it if we cannot.
-    DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}"
-  )
-
-  FIND_LIBRARY(HURRICANE_ANALOGIC_LIBRARY_PATH
-    NAMES analogic
-    PATHS ${HURRICANE_DIR_SEARCH}
-    PATH_SUFFIXES lib
-    # Help the user find it if we cannot.
-    DOC "The ${HURRICANE_INCLUDE_PATH_DESCRIPTION}"
-  )
-
   FIND_PATH(HURRICANE_VIEWER_INCLUDE_PATH
     NAMES CellViewer.h
     PATHS ${HURRICANE_DIR_SEARCH}
@@ -91,19 +75,13 @@ IF(UNIX)
 
   IF(HURRICANE_INCLUDE_PATH)
   IF(HURRICANE_LIBRARY_PATH)
-  IF(HURRICANE_ANALOGIC_INCLUDE_PATH)
-  IF(HURRICANE_ANALOGIC_LIBRARY_PATH)
       SET(HURRICANE_FOUND "YES")
       SET(HURRICANE_INCLUDE_DIR
         ${HURRICANE_INCLUDE_PATH}
-        ${HURRICANE_ANALOGIC_INCLUDE_PATH}
       )
       SET(HURRICANE_LIBRARIES
         ${HURRICANE_LIBRARY_PATH}
-        ${HURRICANE_ANALOGIC_LIBRARY_PATH}
       )
-  ENDIF(HURRICANE_ANALOGIC_LIBRARY_PATH)
-  ENDIF(HURRICANE_ANALOGIC_INCLUDE_PATH)
   ENDIF(HURRICANE_LIBRARY_PATH)
   ENDIF(HURRICANE_INCLUDE_PATH)
 
@@ -138,8 +116,6 @@ IF(UNIX)
   MARK_AS_ADVANCED(
     HURRICANE_INCLUDE_PATH
     HURRICANE_LIBRARY_PATH
-    HURRICANE_ANALOGIC_INCLUDE_PATH
-    HURRICANE_ANALOGIC_LIBRARY_PATH
     HURRICANE_GRAPHICAL_INCLUDE_PATH
     HURRICANE_GRAPHICAL_LIBRARY_PATH
   )