Index: trunk/depend.dep
===================================================================
--- trunk/depend.dep	(revision 296)
+++ trunk/depend.dep	(revision 297)
@@ -68,5 +68,5 @@
 dnmalloc-portable.o: $(srcsrc)/dnmalloc-portable.c Makefile config.h 
 dnmalloc.o: $(srcsrc)/dnmalloc.c Makefile config.h 
-sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h 
+sh_port2proc.o: $(srcsrc)/sh_port2proc.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_error_min.h $(srcinc)/sh_pthread.h $(srcinc)/sh_ipvx.h $(srcinc)/samhain.h $(srcinc)/sh_utils.h $(srcinc)/sh_ipvx.h 
 sh_log_parse_syslog.o: $(srcsrc)/sh_log_parse_syslog.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h 
 sh_log_parse_pacct.o: $(srcsrc)/sh_log_parse_pacct.c Makefile config_xor.h $(srcinc)/samhain.h $(srcinc)/sh_pthread.h $(srcinc)/sh_log_check.h $(srcinc)/sh_utils.h $(srcinc)/sh_string.h 
Index: trunk/depend.sum
===================================================================
--- trunk/depend.sum	(revision 296)
+++ trunk/depend.sum	(revision 297)
@@ -1,1 +1,1 @@
-1732172137
+2854740038
Index: trunk/docs/HOWTO-samhain-on-windows.html
===================================================================
--- trunk/docs/HOWTO-samhain-on-windows.html	(revision 296)
+++ trunk/docs/HOWTO-samhain-on-windows.html	(revision 297)
@@ -273,4 +273,12 @@
 <li>Configure:<br />
 &nbsp; &nbsp;<tt>$ ./configure --enable-xml-log=yes --with-tmp-dir=/usr/local/tmp --with-config-file=/usr/local/etc/samhainrc --with-log-file=/usr/local/log/samhain.log --with-pid-file=/usr/local/var/samhain.pid --with-state-dir=/usr/local/var</tt><br />
+<div class="block">
+<p>
+In my experience, the paths given in the 'configure' command should refer to
+the Cygwin filesystem view, i.e. <tt>/cygdrive/c/...</tt>, otherwise
+samhain may not work from a pure DOS shell, and may not run as a Windows 
+service.
+</p>
+</div>
 </li>
 <li>Make the binary:<br />
@@ -406,4 +414,27 @@
 
 <p>
+[Rainer Wichmann] I had some problems at first getting it to run as a 
+Windows service. Some tips:
+<ul>
+  <li>
+    Running samhain from a pure DOS shell (outside the Cygwin environment) 
+    helps to identify problems, in particular if it refuses to start
+    as a Windows service.
+  </li>
+  <li>
+    I found it neccessary to put the <tt>cygwin1.dll</tt> DLL into the
+    same directory as the <tt>samhain.exe</tt> executable. Also, you
+    can use the command <tt>ldd ./samhain.exe</tt> to identify further
+    Cygwin-specific DLL that may be required (if any).
+  </li>
+  <li>
+    Also, I found it neccessary to use Cygwin-style paths 
+    (<tt>/cygdrive/c/...</tt>) in the './configure ..' command when
+    compiling samhain.
+  </li>
+</ul>
+</p>
+    
+<p>
 [Tip from Jorge Morgado] If you, like me, have a Windows server not part of any domain and (for
 security reasons) you even turn off DNS resolution, you might probably get
Index: trunk/docs/README.UPGRADE
===================================================================
--- trunk/docs/README.UPGRADE	(revision 296)
+++ trunk/docs/README.UPGRADE	(revision 297)
@@ -1,3 +1,15 @@
+to 2.8.0 and higher: samhain supports IPv6 now, which means that the
+  size of the 'ip' column in the database must be increased from
+  VARCHAR(16) to VARCHAR(46).
 
+  BE SURE TO MAKE A BACKUP BEFORE THIS!
+
+  -- mysql: alter table samhain.log modify ip VARCHAR(46);
+
+  -- postgresql: alter table samhain.log alter column ip type varchar(46);
+
+  -- oracle: alter table samhain.log modify ip VARCHAR2(46);
+
+  
 to 2.4.4 and higher: it is possible now to store the full content of
   small files in the baseline database. To support this feature with