diff --git a/configure b/configure
index b440c5d..6467aaa 100755
--- a/configure
+++ b/configure
@@ -262,47 +262,45 @@ fi
 
 if test x"$show_help" = "xyes" ; then
 cat << EOF
-
 Usage: configure [options]
 Options: [defaults in brackets after descriptions]
 
+Standard options:
+  --help                   print this message
+  --prefix=PREFIX          install in PREFIX [$prefix]
+  --exec-prefix=EPREFIX    install architecture-dependent files in EPREFIX
+                           [same as prefix]
+  --bindir=DIR             user executables in DIR [EPREFIX/bin]
+  --libdir=DIR             object code libraries in DIR [EPREFIX/lib]
+  --tccdir=DIR             installation directory [EPREFIX/lib/tcc]
+  --includedir=DIR         C header files in DIR [PREFIX/include]
+  --sharedir=DIR           documentation root DIR [PREFIX]/share
+  --docdir=DIR             documentation in DIR [SHAREDIR/doc/tcc]
+  --mandir=DIR             man documentation in DIR [SHAREDIR/man]
+  --infodir=DIR            info documentation in DIR [SHAREDIR/info]
+
+Advanced options (experts only):
+  --source-path=PATH       path of source code [$source_path]
+  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]
+  --sysroot=PREFIX         prepend PREFIX to library/include paths []
+  --cc=CC                  use C compiler CC [$cc]
+  --disable-static         make libtcc.so instead of libtcc.a
+  --disable-rpath          disable use of -rpath with the above
+  --strip-binaries         strip symbol tables from resulting binaries
+  --with-libgcc            use /lib/libgcc_s.so.1 instead of libtcc.a
+  --enable-mingw32         build windows version on linux with mingw32
+  --enable-cygwin          build windows version on windows with cygwin
+                           [requires cygwin and mingw32-make]
+  --enable-cross           build cross compilers
+  --extra-cflags=          extra compiler flags
+  --extra-ldflags=         extra linker options
+  --with-selinux           use mmap instead of exec mem
+                           [requires write access to /tmp]
+  --sysincludepaths=...    specify system include paths, colon separated
+  --libpaths=...           specify system library paths, colon separated
+  --crtprefix=...          specify locations of crt?.o, colon separated
+  --elfinterp=...          specify elf interpreter
 EOF
-echo "Standard options:"
-echo "  --help                   print this message"
-echo "  --prefix=PREFIX          install in PREFIX [$prefix]"
-echo "  --exec-prefix=EPREFIX    install architecture-dependent files in EPREFIX"
-echo "                           [same as prefix]"
-echo "  --bindir=DIR             user executables in DIR [EPREFIX/bin]"
-echo "  --libdir=DIR             object code libraries in DIR [EPREFIX/lib]"
-echo "  --tccdir=DIR             installation directory [EPREFIX/lib/tcc]"
-echo "  --includedir=DIR         C header files in DIR [PREFIX/include]"
-echo "  --sharedir=DIR           documentation root DIR [PREFIX]/share"
-echo "  --docdir=DIR             documentation in DIR [SHAREDIR/doc/tcc]"
-echo "  --mandir=DIR             man documentation in DIR [SHAREDIR/man]"
-echo "  --infodir=DIR            info documentation in DIR [SHAREDIR/info]"
-echo ""
-echo "Advanced options (experts only):"
-echo "  --source-path=PATH       path of source code [$source_path]"
-echo "  --cross-prefix=PREFIX    use PREFIX for compile tools [$cross_prefix]"
-echo "  --sysroot=PREFIX         prepend PREFIX to library/include paths []"
-echo "  --cc=CC                  use C compiler CC [$cc]"
-echo "  --disable-static         make libtcc.so instead of libtcc.a"
-echo "  --disable-rpath          disable use of -rpath with the above"
-echo "  --strip-binaries         strip symbol tables from resulting binaries"
-echo "  --with-libgcc            use /lib/libgcc_s.so.1 instead of libtcc.a"
-echo "  --enable-mingw32         build windows version on linux with mingw32"
-echo "  --enable-cygwin          build windows version on windows with cygwin"
-echo "                           [requires cygwin and mingw32-make]"
-echo "  --enable-cross           build cross compilers"
-echo "  --extra-cflags=          extra compiler flags"
-echo "  --extra-ldflags=         extra linker options"
-echo "  --with-selinux           use mmap instead of exec mem"
-echo "                           [requires write access to /tmp]"
-echo "  --sysincludepaths=...    specify system include paths, colon separated"
-echo "  --libpaths=...           specify system library paths, colon separated"
-echo "  --crtprefix=...          specify locations of crt?.o, colon separated"
-echo "  --elfinterp=...          specify elf interpreter"
-echo ""
 #echo "NOTE: The object files are build at the place where configure is launched"
 exit 1
 fi
@@ -359,22 +357,24 @@ if test x"$includedir" = x""; then
 includedir="${prefix}/include"
 fi
 
-echo "Binary  directory   $bindir"
-echo "TinyCC directory    $tccdir"
-echo "Library directory   $libdir"
-echo "Include directory   $includedir"
-echo "Manual directory    $mandir"
-echo "Info directory      $infodir"
-echo "Doc directory       $docdir"
-echo "Target root prefix  $sysroot"
-echo "Source path      $source_path"
-echo "C compiler       $cc"
-echo "Target OS        $targetos"
-echo "CPU              $cpu"
-echo "Big Endian       $bigendian"
-echo "gprof enabled    $gprof"
-echo "cross compilers  $build_cross"
-echo "use libgcc       $use_libgcc"
+cat <<EOF
+Binary  directory   $bindir
+TinyCC directory    $tccdir
+Library directory   $libdir
+Include directory   $includedir
+Manual directory    $mandir
+Info directory      $infodir
+Doc directory       $docdir
+Target root prefix  $sysroot
+Source path      $source_path
+C compiler       $cc
+Target OS        $targetos
+CPU              $cpu
+Big Endian       $bigendian
+gprof enabled    $gprof
+cross compilers  $build_cross
+use libgcc       $use_libgcc
+EOF
 
 echo "Creating config.mak and config.h"