diff --git a/cunit-ncurses6.patch b/cunit-ncurses6.patch
new file mode 100644
index 0000000..c9bb38b
--- /dev/null
+++ b/cunit-ncurses6.patch
@@ -0,0 +1,49 @@
+Index: CUnit-2.1-3/CUnit/Sources/Curses/Curses.c
+===================================================================
+--- CUnit-2.1-3.orig/CUnit/Sources/Curses/Curses.c
++++ CUnit-2.1-3/CUnit/Sources/Curses/Curses.c
+@@ -256,10 +256,10 @@ static bool initialize_windows(void)
+ 
+   start_color();
+ 
+-  f_nLeft = application_windows.pMainWin->_begx;
+-  f_nTop = application_windows.pMainWin->_begy;
+-  f_nWidth = application_windows.pMainWin->_maxx;
+-  f_nHeight = application_windows.pMainWin->_maxy;
++  f_nLeft = getbegx(application_windows.pMainWin);
++  f_nTop = getbegy(application_windows.pMainWin);
++  f_nWidth = getmaxx(application_windows.pMainWin);
++  f_nHeight = getmaxy(application_windows.pMainWin);
+ 
+   if (NULL == (application_windows.pTitleWin = newwin(3, f_nWidth, 0, 0))) {
+     goto title_fail;
+@@ -358,10 +358,10 @@ static void refresh_windows(void)
+ {
+   refresh();
+ 
+-  f_nLeft = application_windows.pMainWin->_begx;
+-  f_nTop = application_windows.pMainWin->_begy;
+-  f_nWidth = application_windows.pMainWin->_maxx;
+-  f_nHeight = application_windows.pMainWin->_maxy;
++  f_nLeft = getbegx(application_windows.pMainWin);
++  f_nTop = getbegy(application_windows.pMainWin);
++  f_nWidth = getmaxx(application_windows.pMainWin);
++  f_nHeight = getmaxy(application_windows.pMainWin);
+ 
+   refresh_title_window();
+   refresh_progress_window();
+@@ -907,10 +907,10 @@ static bool create_pad(APPPAD* pPad, WIN
+   pPad->uiColumns = uiCols;
+   pPad->uiPadRow = 0;
+   pPad->uiPadCol = 0;
+-  pPad->uiWinLeft = application_windows.pDetailsWin->_begx + 1;
+-  pPad->uiWinTop = application_windows.pDetailsWin->_begy + 1;
+-  pPad->uiWinColumns = application_windows.pDetailsWin->_maxx - 2;
+-  pPad->uiWinRows = application_windows.pDetailsWin->_maxy - 2;
++  pPad->uiWinLeft = getbegx(application_windows.pDetailsWin) + 1;
++  pPad->uiWinTop = getbegy(application_windows.pDetailsWin) + 1;
++  pPad->uiWinColumns = getmaxx(application_windows.pDetailsWin) - 2;
++  pPad->uiWinRows = getmaxy(application_windows.pDetailsWin) - 2;
+ 
+   bStatus = true;
+ 
diff --git a/cunit.changes b/cunit.changes
index da8b189..539a7f8 100644
--- a/cunit.changes
+++ b/cunit.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Oct 22 10:37:14 UTC 2015 - idonmez@suse.com
+
+- Add cunit-ncurses6.patch to compile with ncurses6 
+
 -------------------------------------------------------------------
 Tue May 26 16:00:55 UTC 2015 - ddiss@suse.com
 
diff --git a/cunit.spec b/cunit.spec
index ce043f6..4caa421 100644
--- a/cunit.spec
+++ b/cunit.spec
@@ -28,6 +28,7 @@ Group:          Development/Libraries/C and C++
 Url:            http://cunit.sourceforge.net/
 Source0:        http://download.sourceforge.net/cunit/%{_name}-%{_version}.tar.bz2
 Patch0:         cunit-link-ncurses.diff
+Patch1:         cunit-ncurses6.patch
 BuildRequires:  autoconf
 BuildRequires:  automake
 BuildRequires:  libtool
@@ -75,6 +76,8 @@ This package installs the CUnit shared library.
 %prep
 %setup -q -n %{_name}-%{_version}
 %patch0 -p1
+%patch1 -p1
+
 chmod -x AUTHORS ChangeLog COPYING NEWS README TODO doc/*.html doc/*.css
 
 %build