diff --git a/ChangeLog b/ChangeLog
index 4837b38..58f1d31 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Version 1.87b:
+--------------
+
+  - Dictionary improvements.
+
 Version 1.86b:
 --------------
 
diff --git a/Makefile b/Makefile
index e76ccef..a0af44f 100644
--- a/Makefile
+++ b/Makefile
@@ -20,7 +20,7 @@
 #
 
 PROGNAME   = skipfish
-VERSION    = 1.86b
+VERSION    = 1.87b
 
 OBJFILES   = http_client.c database.c crawler.c analysis.c report.c
 INCFILES   = alloc-inl.h string-inl.h debug.h types.h http_client.h \
diff --git a/dictionaries/complete.wl b/dictionaries/complete.wl
index 10b73c3..12e852b 100644
--- a/dictionaries/complete.wl
+++ b/dictionaries/complete.wl
@@ -1,4 +1,5 @@
 e 1 1 1 7z
+e 1 1 1 as
 e 1 1 1 asmx
 e 1 1 1 asp
 e 1 1 1 aspx
@@ -36,6 +37,7 @@ e 1 1 1 htm
 e 1 1 1 html
 e 1 1 1 inc
 e 1 1 1 ini
+e 1 1 1 jar
 e 1 1 1 java
 e 1 1 1 jhtml
 e 1 1 1 jpg
@@ -89,14 +91,17 @@ e 1 1 1 temp
 e 1 1 1 test
 e 1 1 1 tgz
 e 1 1 1 tmp
+e 1 1 1 tpl
 e 1 1 1 trace
 e 1 1 1 txt
 e 1 1 1 vb
 e 1 1 1 vbs
+e 1 1 1 war
 e 1 1 1 ws
 e 1 1 1 xls
 e 1 1 1 xml
 e 1 1 1 xsl
+e 1 1 1 xslt
 e 1 1 1 yml
 e 1 1 1 zip
 w 1 1 1 .bash_history
@@ -208,6 +213,7 @@ w 1 1 1 SQL
 w 1 1 1 SUNWmc
 w 1 1 1 SiteScope
 w 1 1 1 SiteServer
+w 1 1 1 SOAPMonitor
 w 1 1 1 Spy
 w 1 1 1 TEMP
 w 1 1 1 TMP
@@ -267,6 +273,7 @@ w 1 1 1 addressbook
 w 1 1 1 adm
 w 1 1 1 admin
 w 1 1 1 admin_
+w 1 1 1 admin-console
 w 1 1 1 admins
 w 1 1 1 adodb
 w 1 1 1 ads
@@ -1012,8 +1019,11 @@ w 1 1 1 javadoc
 w 1 1 1 javascript
 w 1 1 1 javax
 w 1 1 1 jboss
+w 1 1 1 jbossas
+w 1 1 1 jbossws
 w 1 1 1 jdbc
 w 1 1 1 jigsaw
+w 1 1 1 jira
 w 1 1 1 jj
 w 1 1 1 jmx-console
 w 1 1 1 job
diff --git a/dictionaries/extensions-only.wl b/dictionaries/extensions-only.wl
index 1bf1a17..da8cb50 100644
--- a/dictionaries/extensions-only.wl
+++ b/dictionaries/extensions-only.wl
@@ -1,4 +1,5 @@
 e 1 1 1 7z
+e 1 1 1 as
 e 1 1 1 asmx
 e 1 1 1 asp
 e 1 1 1 aspx
@@ -34,6 +35,7 @@ e 1 1 1 htm
 e 1 1 1 html
 e 1 1 1 inc
 e 1 1 1 ini
+e 1 1 1 jar
 e 1 1 1 java
 e 1 1 1 jhtml
 e 1 1 1 jpg
@@ -87,13 +89,16 @@ e 1 1 1 temp
 e 1 1 1 test
 e 1 1 1 tgz
 e 1 1 1 tmp
+e 1 1 1 tpl
 e 1 1 1 trace
 e 1 1 1 txt
 e 1 1 1 vb
 e 1 1 1 vbs
+e 1 1 1 war
 e 1 1 1 ws
 e 1 1 1 xls
 e 1 1 1 xml
 e 1 1 1 xsl
+e 1 1 1 xslt
 e 1 1 1 yml
 e 1 1 1 zip
diff --git a/dictionaries/medium.wl b/dictionaries/medium.wl
index 5a08df3..babc63e 100644
--- a/dictionaries/medium.wl
+++ b/dictionaries/medium.wl
@@ -65,6 +65,7 @@ e 1 1 1 ws
 e 1 1 1 xls
 e 1 1 1 xml
 e 1 1 1 xsl
+e 1 1 1 xslt
 e 1 1 1 zip
 w 1 1 1 .bash_history
 w 1 1 1 .bashrc
@@ -176,6 +177,7 @@ w 1 1 1 SQL
 w 1 1 1 SUNWmc
 w 1 1 1 SiteScope
 w 1 1 1 SiteServer
+w 1 1 1 SOAPMonitor
 w 1 1 1 Spy
 w 1 1 1 TEMP
 w 1 1 1 TMP
@@ -234,6 +236,7 @@ w 1 1 1 addpost
 w 1 1 1 addressbook
 w 1 1 1 adm
 w 1 1 1 admin
+w 1 1 1 admin-console
 w 1 1 1 admin_
 w 1 1 1 admins
 w 1 1 1 adodb
@@ -989,8 +992,11 @@ w 1 1 1 javadoc
 w 1 1 1 javascript
 w 1 1 1 javax
 w 1 1 1 jboss
+w 1 1 1 jbossas
+w 1 1 1 jbossws
 w 1 1 1 jdbc
 w 1 1 1 jigsaw
+w 1 1 1 jira
 w 1 1 1 jj
 w 1 1 1 jmx-console
 w 1 1 1 job
diff --git a/dictionaries/minimal.wl b/dictionaries/minimal.wl
index 5b4748b..add9f74 100644
--- a/dictionaries/minimal.wl
+++ b/dictionaries/minimal.wl
@@ -10,6 +10,7 @@ e 1 1 1 error
 e 1 1 1 html
 e 1 1 1 inc
 e 1 1 1 ini
+e 1 1 1 jar
 e 1 1 1 java
 e 1 1 1 key
 e 1 1 1 log
@@ -25,6 +26,7 @@ e 1 1 1 test
 e 1 1 1 tmp
 e 1 1 1 txt
 e 1 1 1 xml
+e 1 1 1 xslt
 e 1 1 1 zip
 w 1 1 1 .bash_history
 w 1 1 1 .bashrc
@@ -136,6 +138,7 @@ w 1 1 1 SQL
 w 1 1 1 SUNWmc
 w 1 1 1 SiteScope
 w 1 1 1 SiteServer
+w 1 1 1 SOAPMonitor
 w 1 1 1 Spy
 w 1 1 1 TEMP
 w 1 1 1 TMP
@@ -195,6 +198,7 @@ w 1 1 1 addressbook
 w 1 1 1 adm
 w 1 1 1 admin
 w 1 1 1 admin_
+w 1 1 1 admin-console
 w 1 1 1 admins
 w 1 1 1 adodb
 w 1 1 1 ads
@@ -965,9 +969,12 @@ w 1 1 1 javadoc
 w 1 1 1 javascript
 w 1 1 1 javax
 w 1 1 1 jboss
+w 1 1 1 jbossas
+w 1 1 1 jbossws
 w 1 1 1 jdbc
 w 1 1 1 jhtml
 w 1 1 1 jigsaw
+w 1 1 1 jira
 w 1 1 1 jj
 w 1 1 1 jmx-console
 w 1 1 1 job