diff -Nrup varnish-2.1.4.patched.orig/Makefile.am varnish-2.1.4.patched.new/Makefile.am
--- varnish-2.1.4.patched.orig/Makefile.am	2010-10-21 10:57:22.000000000 +0200
+++ varnish-2.1.4.patched.new/Makefile.am	2010-12-30 03:06:32.000000000 +0100
@@ -3,7 +3,7 @@
 SUBDIRS = include lib bin man etc doc
 
 SUBDIRS += redhat
-
+ACLOCAL_AMFLAGS = -I m4
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = varnishapi.pc
 
diff -Nrup varnish-2.1.4.patched.orig/bin/varnishhist/varnishhist.c varnish-2.1.4.patched.new/bin/varnishhist/varnishhist.c
--- varnish-2.1.4.patched.orig/bin/varnishhist/varnishhist.c	2010-10-21 10:57:22.000000000 +0200
+++ varnish-2.1.4.patched.new/bin/varnishhist/varnishhist.c	2010-12-31 13:34:30.093200000 +0100
@@ -36,7 +36,7 @@
 SVNID("$Id: varnishhist.c 4093 2009-06-06 15:56:17Z des $")
 
 #include <sys/types.h>
-#include <curses.h>
+#include <ncursesw/curses.h>
 #include <errno.h>
 #include <limits.h>
 #include <math.h>
diff -Nrup varnish-2.1.4.patched.orig/bin/varnishsizes/varnishsizes.c varnish-2.1.4.patched.new/bin/varnishsizes/varnishsizes.c
--- varnish-2.1.4.patched.orig/bin/varnishsizes/varnishsizes.c	2010-10-21 10:57:22.000000000 +0200
+++ varnish-2.1.4.patched.new/bin/varnishsizes/varnishsizes.c	2010-12-31 13:34:30.093200000 +0100
@@ -36,7 +36,7 @@
 SVNID("$Id: varnishsizes.c 4709 2010-04-21 10:40:27Z tfheen $")
 
 #include <sys/types.h>
-#include <curses.h>
+#include <ncursesw/curses.h>
 #include <errno.h>
 #include <limits.h>
 #include <math.h>
diff -Nrup varnish-2.1.4.patched.orig/bin/varnishstat/varnishstat.c varnish-2.1.4.patched.new/bin/varnishstat/varnishstat.c
--- varnish-2.1.4.patched.orig/bin/varnishstat/varnishstat.c	2010-10-21 10:57:22.000000000 +0200
+++ varnish-2.1.4.patched.new/bin/varnishstat/varnishstat.c	2010-12-31 13:34:30.093200000 +0100
@@ -37,7 +37,7 @@ SVNID("$Id: varnishstat.c 4553 2010-02-1
 
 #include <sys/time.h>
 
-#include <curses.h>
+#include <ncursesw/curses.h>
 #include <errno.h>
 #include <limits.h>
 #include <signal.h>
diff -Nrup varnish-2.1.4.patched.orig/bin/varnishtop/varnishtop.c varnish-2.1.4.patched.new/bin/varnishtop/varnishtop.c
--- varnish-2.1.4.patched.orig/bin/varnishtop/varnishtop.c	2010-10-21 10:57:22.000000000 +0200
+++ varnish-2.1.4.patched.new/bin/varnishtop/varnishtop.c	2010-12-31 13:34:30.093200000 +0100
@@ -36,7 +36,7 @@
 SVNID("$Id: varnishtop.c 5150 2010-08-30 12:01:05Z tfheen $")
 
 #include <ctype.h>
-#include <curses.h>
+#include <ncursesw/curses.h>
 #include <errno.h>
 #include <pthread.h>
 #include <signal.h>
diff -Nrup varnish-2.1.4.patched.orig/configure.ac varnish-2.1.4.patched.new/configure.ac
--- varnish-2.1.4.patched.orig/configure.ac	2010-12-30 13:33:44.000000000 +0100
+++ varnish-2.1.4.patched.new/configure.ac	2010-12-30 13:33:44.000000000 +0100
@@ -8,7 +8,7 @@ AC_REVISION([$Id: configure.ac 5443 2010
 AC_INIT([Varnish], [2.1.4], [varnish-dev@varnish-cache.org])
 AC_CONFIG_SRCDIR(include/varnishapi.h)
 AM_CONFIG_HEADER(config.h)
-
+AC_CONFIG_MACRO_DIR([m4])
 AC_CANONICAL_SYSTEM
 AC_LANG(C)