diff --git a/ChangeLog b/ChangeLog
index d79ae16..6c42451 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,6 @@
+2005-05-15  Johannes E. Schindelin  <Johannes.Schindelin@gmx.de>
+	* acinclude.m4: fix compilation for systems without socklen_t
+
 2005-05-17  Karl Runge <runge@karlrunge.com>
 	* x11vnc: more scrolling, -scr_term, -wait_ui, -nowait_bog
 
diff --git a/acinclude.m4 b/acinclude.m4
index 2550ceb..ba025e3 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -559,7 +559,8 @@ else
   AC_MSG_NOTICE(creating $_OUT - prefix $_UPP for $_INP defines)
   if test -f $_INP ; then
     echo "s/@%:@undef  *\\(@<:@m4_cr_LETTERS[]_@:>@\\)/@%:@undef $_UPP""_\\1/" > _script
-    echo "s/@%:@undef  *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/" >> _script
+    # no! these are things like socklen_t, const, vfork
+    # echo "s/@%:@undef  *\\(@<:@m4_cr_letters@:>@\\)/@%:@undef $_LOW""_\\1/" >> _script
     echo "s/@%:@def[]ine  *\\(@<:@m4_cr_LETTERS[]_@:>@@<:@_symbol@:>@*\\)\\(.*\\)/@%:@ifndef $_UPP""_\\1 \\" >> _script
     echo "@%:@def[]ine $_UPP""_\\1 \\2 \\" >> _script
     echo "@%:@endif/" >>_script
diff --git a/rfb/rfb.h b/rfb/rfb.h
index 007c13c..5866cd6 100644
--- a/rfb/rfb.h
+++ b/rfb/rfb.h
@@ -45,10 +45,6 @@ extern "C"
 #include <winsock2.h>
 #endif
 
-#ifndef LIBVNCSERVER_HAVE_SOCKLEN_T
-typedef int socklen_t;
-#endif
-
 #ifdef LIBVNCSERVER_HAVE_LIBPTHREAD
 #include <pthread.h>
 #if 0 /* debugging */