diff -u htop-1.0/debian/control htop-1.0/debian/control
--- htop-1.0/debian/control
+++ htop-1.0/debian/control
@@ -2,7 +2,7 @@
 Section: utils
 Priority: optional
 Maintainer: Eugene V. Lyubimkin <jackyf@debian.org>
-Build-Depends: debhelper (>= 7), libncurses5-dev, autotools-dev, quilt (>= 0.40), python-minimal
+Build-Depends: debhelper (>= 7), libncurses5-dev, libncursesw5-dev, autotools-dev, quilt (>= 0.40), python-minimal
 Standards-Version: 3.9.2
 Homepage: http://htop.sourceforge.net
 
diff -u htop-1.0/debian/changelog htop-1.0/debian/changelog
--- htop-1.0/debian/changelog
+++ htop-1.0/debian/changelog
@@ -1,3 +1,9 @@
+htop (1.0-0ubuntu2) oneiric; urgency=low
+
+  * Fixed build
+
+ -- Andrei Dziahel <develop7@develop7.info>  Wed, 23 Nov 2011 12:39:51 +0300
+
 htop (1.0-0ubuntu1) oneiric; urgency=low
 
   * New upstream release
diff -u htop-1.0/debian/patches/700-ltrace-support.patch htop-1.0/debian/patches/700-ltrace-support.patch
--- htop-1.0/debian/patches/700-ltrace-support.patch
+++ htop-1.0/debian/patches/700-ltrace-support.patch
@@ -1,8 +1,8 @@
 Add support for 'ltrace' in addition to 'strace' support.
-Index: htop/TraceScreen.c
+Index: htop-1.0/TraceScreen.c
 ===================================================================
---- htop.orig/TraceScreen.c	2011-01-16 17:02:59.000000000 +0200
-+++ htop/TraceScreen.c	2011-01-16 18:15:07.000000000 +0200
+--- htop-1.0.orig/TraceScreen.c	2011-11-23 12:34:59.167613063 +0300
++++ htop-1.0/TraceScreen.c	2011-11-23 12:34:59.607615915 +0300
 @@ -23,11 +23,17 @@
  
  /*{
@@ -103,10 +103,10 @@
 +   fclose(trace);
     CRT_enableDelay();
  }
-Index: htop/TraceScreen.h
+Index: htop-1.0/TraceScreen.h
 ===================================================================
---- htop.orig/TraceScreen.h	2009-06-29 13:18:40.000000000 +0300
-+++ htop/TraceScreen.h	2011-01-16 18:15:07.000000000 +0200
+--- htop-1.0.orig/TraceScreen.h	2011-11-23 12:34:59.099612622 +0300
++++ htop-1.0/TraceScreen.h	2011-11-23 12:34:59.607615915 +0300
 @@ -25,15 +25,21 @@
  #include "FunctionBar.h"
  
@@ -130,27 +130,11 @@
  
  void TraceScreen_delete(TraceScreen* this);
  
-Index: htop/htop.1
+Index: htop-1.0/htop.c
 ===================================================================
---- htop.orig/htop.1	2011-01-16 17:02:59.000000000 +0200
-+++ htop/htop.1	2011-01-16 18:15:07.000000000 +0200
-@@ -54,6 +54,11 @@
- Display open files for a process: if lsof(1) is installed, pressing this key
- will display the list of file descriptors opened by the process.
- .TP
-+.B l
-+Trace process library calls: if ltrace(1) is installed, pressing this key
-+will attach it to the currently selected process, presenting a live
-+update of library calls issued by the process.
-+.TP
- .B F1, h
- Help screen
- .TP
-Index: htop/htop.c
-===================================================================
---- htop.orig/htop.c	2011-01-16 17:02:59.000000000 +0200
-+++ htop/htop.c	2011-01-16 18:15:07.000000000 +0200
-@@ -133,6 +133,7 @@
+--- htop-1.0.orig/htop.c	2011-11-23 12:34:59.131612830 +0300
++++ htop-1.0/htop.c	2011-11-23 12:34:59.607615915 +0300
+@@ -132,6 +132,7 @@
     mvaddstr(19, 0, "   F2 S: setup                           F6 >: select sort column");
     mvaddstr(20, 0, "   F1 h: show this help screen              l: list open files with lsof");
     mvaddstr(21, 0, "  F10 q: quit                               s: trace syscalls with strace");
@@ -158,7 +142,7 @@
  
     attrset(CRT_colors[HELP_BOLD]);
     mvaddstr( 9, 0, " Arrows"); mvaddstr( 9,40, " F5 t");
-@@ -152,10 +153,11 @@
+@@ -151,10 +152,11 @@
     mvaddstr(19, 0, "   F2 S"); mvaddstr(19,40, " F6 >");
     mvaddstr(20, 0, " ? F1 h"); mvaddstr(20,40, "    l");
     mvaddstr(21, 0, "  F10 q"); mvaddstr(21,40, "    s");
@@ -171,7 +155,7 @@
     attrset(CRT_colors[DEFAULT_COLOR]);
     refresh();
     CRT_readKey();
-@@ -580,9 +582,20 @@
+@@ -669,9 +671,20 @@
           Panel_onKey(panel, KEY_DOWN);
           break;
        }
reverted:
--- htop-1.0/debian/patches/100-fix-cgroups-crash.patch
+++ htop-1.0.orig/debian/patches/100-fix-cgroups-crash.patch
@@ -1,18 +0,0 @@
-diff --git a/ProcessList.c b/ProcessList.c
-index c234357..3bb1b81 100644
---- a/ProcessList.c
-+++ b/ProcessList.c
-@@ -473,7 +473,12 @@ static void ProcessList_readCGroupFile(Process* process, const char* dirname, co
-       char** fields = String_split(trimmed, ':');
-       free(trimmed);
- 
--      process->cgroup = strndup(fields[2] + 1, 10);
-+      if (!fields[1] || !fields[2]) {
-+         process->cgroup = strdup(""); // cgroups do not work
-+      }
-+      else {
-+         process->cgroup = strndup(fields[2] + 1, 10);
-+      }
-       String_freeArray(fields);
-    }
-    fclose(file);
diff -u htop-1.0/debian/patches/series htop-1.0/debian/patches/series
--- htop-1.0/debian/patches/series
+++ htop-1.0/debian/patches/series
@@ -1,3 +1 @@
-100-fix-cgroups-crash.patch
-600-openvz-veid-on-kernels-gt-2.6.18.patch 
 700-ltrace-support.patch