diff --git a/Source/CMakeLists.txt b/Source/CMakeLists.txt
index 944197e65d..164df107e6 100644
--- a/Source/CMakeLists.txt
+++ b/Source/CMakeLists.txt
@@ -46,12 +46,12 @@ IF (WIN32)
   ENDIF(NOT UNIX)
 ENDIF (WIN32)
 
-#IF (UNIX)
-#  INCLUDE (${CMAKE_ROOT}/Modules/FindCurses.cmake)
-#  IF (CURSES_LIBRARY)
-#    SUBDIRS(CursesDialog)
-#  ENDIF (CURSES_LIBRARY)
-#ENDIF (UNIX)
+IF (UNIX)
+  INCLUDE (${CMAKE_ROOT}/Modules/FindCurses.cmake)
+  IF (CURSES_LIBRARY)
+    SUBDIRS(CursesDialog)
+  ENDIF (CURSES_LIBRARY)
+ENDIF (UNIX)
 
 SOURCE_FILES(SRCS cmUnixMakefileGenerator.cxx)
 
diff --git a/Source/CursesDialog/cmCursesMainForm.cxx b/Source/CursesDialog/cmCursesMainForm.cxx
index 56632189ca..9e2c111110 100644
--- a/Source/CursesDialog/cmCursesMainForm.cxx
+++ b/Source/CursesDialog/cmCursesMainForm.cxx
@@ -278,7 +278,8 @@ void cmCursesMainForm::RunCMake(bool generateMakefiles)
 // copy from the list box to the cache manager
 void cmCursesMainForm::FillCacheManagerFromUI()
 { 
-
+  std::string tmpString;
+  
   cmCacheManager::GetInstance()->GetCacheMap();
   int size = m_Entries->size();
   for(int i=0; i < size; i++)
@@ -288,7 +289,9 @@ void cmCursesMainForm::FillCacheManagerFromUI()
 	(*m_Entries)[i]->m_Key.c_str());
     if (entry)
       {
-      entry->m_Value = (*m_Entries)[i]->m_Entry->GetValue();
+      tmpString = (*m_Entries)[i]->m_Entry->GetValue();
+      // Remove trailing spaces
+      entry->m_Value = tmpString.substr(0,tmpString.find_last_not_of(" ")+1);
       }
     }
 }