diff --git a/Makefile b/Makefile
index 422a85307..4703c2cc3 100644
--- a/Makefile
+++ b/Makefile
@@ -890,8 +890,9 @@ all:
 	@echo
 	@echo "Please choose the target among the following supported list :"
 	@echo
-	@echo "   linux2628, linux26, linux24, linux24e, linux22, solaris"
-	@echo "   freebsd, openbsd, cygwin, custom, generic"
+	@echo "   linux2628, linux26, linux24, linux24e, linux22, solaris,"
+	@echo "   freebsd, netbsd, osx, openbsd, aix51, aix52, cygwin, haiku,"
+	@echo "   generic, custom"
 	@echo
 	@echo "Use \"generic\" if you don't want any optimization, \"custom\" if you"
 	@echo "want to precisely tweak every option, or choose the target which"
diff --git a/README b/README
index fb82d92dc..8b48eb0dc 100644
--- a/README
+++ b/README
@@ -25,7 +25,7 @@ To build haproxy, you will need :
   - GNU make. Neither Solaris nor OpenBSD's make work with the GNU Makefile.
     If you get many syntax errors when running "make", you may want to retry
     with "gmake" which is the name commonly used for GNU make on BSD systems.
-  - GCC between 2.95 and 4.8. Others may work, but not tested.
+  - GCC between 2.95 and 8.1. Others may work, but not tested.
   - GNU ld
 
 Also, you might want to build with libpcre support, which will provide a very
@@ -40,7 +40,7 @@ and assign it to the TARGET variable :
   - linux26     for Linux 2.6 and above
   - linux2628   for Linux 2.6.28, 3.x, and above (enables splice and tproxy)
   - solaris     for Solaris 8 or 10 (others untested)
-  - freebsd     for FreeBSD 5 to 10 (others untested)
+  - freebsd     for FreeBSD 5 to 12 (others untested)
   - netbsd      for NetBSD
   - osx         for Mac OS/X
   - openbsd     for OpenBSD 5.7 and above