diff --git a/CHANGES b/CHANGES
index f55e9a0..d6ed70b 100755
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,9 @@
+Changes to proxytunnel version 1.0.8 -- Fri Apr 19 10:25:00 CET 2002
+
+- Fixed help-text when system doesn't support long-options
+- Cleaned up some code w.r.t short and/or long options, added includes
+  for getopt on freebsd.
+
 Changes to proxytunnel version 1.0.7 -- Wed Nov 28 09:49:41 CET 2001
 
 - Added rpm spec file by Ralph Loader <suckfish@ihug.co.nz> -- Maniac
diff --git a/cmdline.c b/cmdline.c
index a92403b..d6e894d 100755
--- a/cmdline.c
+++ b/cmdline.c
@@ -20,6 +20,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 #include "config.h"
 
 #ifndef HAVE_GETOPT_LONG
@@ -59,6 +60,12 @@ cmdline_parser_print_help (void)
    -v         --verbose           Turn on verbosity (default=off)\n\
    -q         --quiet             Suppress messages  (default=off)\n\
 ", PACKAGE);
+
+#ifndef HAVE_GETOPT_LONG
+  printf( "\n"
+"Notice: This version is compiled without support for long options.\n"
+"This means you can only use the short (1 letter) options on the commandline.\n" );
+#endif
 }
 
 
@@ -120,9 +127,9 @@ int cmdline_parser( int argc, char * const *argv, struct gengetopt_args_info *ar
 
   while (1)
     {
+#ifdef HAVE_GETOPT_LONG
       int option_index = 0;
 
-#ifdef HAVE_GETOPT_LONG
       static struct option long_options[] = {
         { "help",	0, NULL, 'h' },
         { "version",	0, NULL, 'V' },
diff --git a/config.h b/config.h
index 273f5ba..6e4f7f4 100755
--- a/config.h
+++ b/config.h
@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#define VERSION	"1.0.7"
+#define VERSION	"1.0.8"
 #define PACKAGE	"Proxytunnel"
 #define PURPOSE "Build generic tunnels through HTTPS proxys"
 #define AUTHORS "Jos Visser (Muppet) <josv@osp.nl>, Mark Janssen (Maniac) <maniac@maniac.nl>"
diff --git a/proxytunnel b/proxytunnel
index 9c8897f..a7f91b0 100755
Binary files a/proxytunnel and b/proxytunnel differ