diff --git a/autogen.sh b/autogen.sh
index cf4b9798..95152923 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -31,6 +31,8 @@ if type lynx >/dev/null 2>&1 ; then
   lynx -dump -nolist docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 elif type elinks >/dev/null 2>&1 ; then
   elinks -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
+elif type links >/dev/null 2>&1 ; then
+  links -dump docs/faq.html|perl -pe 's/^ *//; if ($_ eq "\n" && $state eq "Q") { $_ = ""; } elsif (/^([QA]):/) { $state = $1 } elsif ($_ ne "\n") { $_ = "   $_"; };' > docs/faq.txt
 else
   echo "**Error**: No lynx or elinks present"
   exit 1
diff --git a/configure.ac b/configure.ac
index 2a7bee0d..15000d5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -200,6 +200,10 @@ esac
 AC_CHECK_FUNC(socket, [], [
 	AC_CHECK_LIB(socket, socket, [
 		LIBS="$LIBS -lsocket"
+	],[
+		AC_CHECK_LIB(network, socket, [
+			LIBS="$LIBS -lnetwork"
+		])
 	])
 ])
 
diff --git a/m4/curses.m4 b/m4/curses.m4
index 82b110fe..0241b380 100644
--- a/m4/curses.m4
+++ b/m4/curses.m4
@@ -244,6 +244,26 @@ AC_DEFUN([AC_SEARCH_NCURSES], [
 	       [renamed ncurses in /usr/local/include/ncurses])
     AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES,
 	       [renamed ncurses in /usr/include/ncurses])
+    AC_NCURSES(/usr/include/ncurses, curses.h, -lncurses, -I/usr/include/ncurses -DRENAMED_NCURSES,
+	       [renamed ncurses in /usr/include/ncurses])
+
+    dnl
+    dnl Try Haiku ncurses
+    dnl Depending if we are building for the primary or secondary arch
+    dnl it can be installed at different locations
+    dnl
+    if $search_ncurses
+    then
+	if test -d /system/develop/headers
+	then
+	    haiku_arch=`getarch`
+	    for haiku_h in `findpaths -a $haiku_arch B_FIND_PATH_HEADERS_DIRECTORY`
+	    do
+		AC_NCURSES($haiku_h, ncurses.h, -lncurses,,
+		    [ncurses in $haiku_h])
+	    done
+        fi
+    fi
 
     dnl
     dnl We couldn't find ncurses, try SysV curses