diff --git a/Modules/FindCurses.cmake b/Modules/FindCurses.cmake
index 929eef1ba..44c616c61 100644
--- a/Modules/FindCurses.cmake
+++ b/Modules/FindCurses.cmake
@@ -3,14 +3,18 @@
 #
 
 FIND_PATH(CURSES_INCLUDE_PATH curses.h
-/usr/local/include
-/usr/include
+/usr/local/include /usr/include
 )
 
 FIND_LIBRARY(CURSES_LIBRARY curses
-PATHS /usr/lib /usr/local/lib
+PATHS /usr/local/lib /usr/lib 
+)
+
+FIND_LIBRARY(CURSES_EXTRA_LIBRARY cur_colr
+PATHS /usr/local/lib /usr/lib 
 )
 
 FIND_LIBRARY(FORM_LIBRARY form
-PATHS /usr/lib /usr/local/lib
+PATHS /usr/local/lib /usr/lib 
 )
+
diff --git a/Source/CursesDialog/CMakeLists.txt b/Source/CursesDialog/CMakeLists.txt
index d0dad7c9a..336b64f72 100644
--- a/Source/CursesDialog/CMakeLists.txt
+++ b/Source/CursesDialog/CMakeLists.txt
@@ -17,6 +17,11 @@ SOURCE_FILES( CURSES_SRCS
 INCLUDE_DIRECTORIES(${CURSES_INCLUDE_PATH})
 INCLUDE_DIRECTORIES(${CMake_SOURCE_DIR}/Source/CursesDialog/form/)
 LINK_LIBRARIES(${CURSES_LIBRARY})
+
+IF(CURSES_EXTRA_LIBRARY)
+  LINK_LIBRARIES(${CURSES_EXTRA_LIBRARY})
+ENDIF(CURSES_EXTRA_LIBRARY)
+
 LINK_LIBRARIES(cmForm)
 
 ADD_EXECUTABLE(ccurses CURSES_SRCS)
\ No newline at end of file
diff --git a/Source/CursesDialog/cmCursesForm.h b/Source/CursesDialog/cmCursesForm.h
index 4924f2ea6..bf6d065a2 100644
--- a/Source/CursesDialog/cmCursesForm.h
+++ b/Source/CursesDialog/cmCursesForm.h
@@ -1,8 +1,7 @@
 #ifndef __cmCursesForm_h
 #define __cmCursesForm_h
 
-#include <curses.h>
-#include <form.h>
+#include "cmCursesStandardIncludes.h"
 
 class cmCursesForm
 {
diff --git a/Source/CursesDialog/cmCursesLabelWidget.h b/Source/CursesDialog/cmCursesLabelWidget.h
index 6d3a7cfa6..93442d2a4 100644
--- a/Source/CursesDialog/cmCursesLabelWidget.h
+++ b/Source/CursesDialog/cmCursesLabelWidget.h
@@ -2,8 +2,7 @@
 #define __cmCursesLabelWidget_h
 
 #include "cmCursesWidget.h"
-#include <curses.h>
-#include <form.h>
+#include "cmCursesStandardIncludes.h"
 
 
 class cmCursesLabelWidget : public cmCursesWidget
diff --git a/Source/CursesDialog/cmCursesMainForm.h b/Source/CursesDialog/cmCursesMainForm.h
index f3e7917a9..5102708de 100644
--- a/Source/CursesDialog/cmCursesMainForm.h
+++ b/Source/CursesDialog/cmCursesMainForm.h
@@ -3,8 +3,7 @@
 
 #include "../cmStandardIncludes.h"
 #include "cmCursesForm.h"
-#include <curses.h>
-#include <form.h>
+#include "cmCursesStandardIncludes.h"
 
 class cmCursesCacheEntryComposite;
 
diff --git a/Source/CursesDialog/cmCursesStandardIncludes.h b/Source/CursesDialog/cmCursesStandardIncludes.h
new file mode 100644
index 000000000..1cb009b40
--- /dev/null
+++ b/Source/CursesDialog/cmCursesStandardIncludes.h
@@ -0,0 +1,7 @@
+#ifdef __hpux
+ #define _XOPEN_SOURCE_EXTENDED
+ #define _BOOL_DEFINED
+#endif /* __hpux */
+
+#include <curses.h>
+#include <form.h>
diff --git a/Source/CursesDialog/cmCursesWidget.h b/Source/CursesDialog/cmCursesWidget.h
index 9d8ce3935..a516bca40 100644
--- a/Source/CursesDialog/cmCursesWidget.h
+++ b/Source/CursesDialog/cmCursesWidget.h
@@ -2,8 +2,7 @@
 #define __cmCursesWidget_h
 
 #include "../cmCacheManager.h"
-#include <curses.h>
-#include <form.h>
+#include "cmCursesStandardIncludes.h"
 
 class cmCursesWidget
 {
diff --git a/Source/CursesDialog/form/frm_driver.c b/Source/CursesDialog/form/frm_driver.c
index 6ea5dab51..03e02c262 100644
--- a/Source/CursesDialog/form/frm_driver.c
+++ b/Source/CursesDialog/form/frm_driver.c
@@ -29,6 +29,9 @@
 /****************************************************************************
  *   Author: Juergen Pfeifer <juergen.pfeifer@gmx.net> 1995,1997            *
  ****************************************************************************/
+#ifdef __hpux
+ #define _XOPEN_SOURCE_EXTENDED
+#endif /* __hpux */
 #include "form.priv.h"
 
 MODULE_ID("$Id$")
diff --git a/Source/CursesDialog/form/frm_req_name.c b/Source/CursesDialog/form/frm_req_name.c
index e9cd426f4..30b3aca89 100644
--- a/Source/CursesDialog/form/frm_req_name.c
+++ b/Source/CursesDialog/form/frm_req_name.c
@@ -35,6 +35,9 @@
 * Routines to handle external names of menu requests                       *
 ***************************************************************************/
 
+#ifdef __hpux
+ #define _XOPEN_SOURCE_EXTENDED
+#endif /* __hpux */
 #include "form.priv.h"
 
 MODULE_ID("$Id$")