diff --git a/autotests/folding/highlight.java.fold b/autotests/folding/highlight.java.fold
--- a/autotests/folding/highlight.java.fold
+++ b/autotests/folding/highlight.java.fold
@@ -35,5 +35,14 @@
         int num = 1;
         num = 0x2;
         double f = .4e+49;
+        
+        long int_dec = 1__23_48l;
+        long int_oct = 072034__4l;
+        long int_hex = 0xa__12Ff_13L;
+        int int_bin = 0B1011___01;
+        
+        double float_hex = 0x1f__a2.d_f10P+1074D;
+        float float_dec = 1__24.1_32e-1____23F;
+        float[] float_d = <beginfold id='3'>{</beginfold id='3'>1.,1.E+3,1.E+3f,1.F,1.1E+3d,1.1E+3,1.1f,1.1,.1E+3f,.1E+3,.1f,.1,1E+3f,1E+3,1f,1d<endfold id='3'>}</endfold id='3'>;
     <endfold id='3'>}</endfold id='3'>
 <endfold id='3'>}</endfold id='3'>
diff --git a/autotests/html/highlight.java.html b/autotests/html/highlight.java.html
--- a/autotests/html/highlight.java.html
+++ b/autotests/html/highlight.java.html
@@ -41,6 +41,15 @@
         <span style="color:#0057ae;">int</span> num = <span style="color:#b08000;">1</span>;
         num = <span style="color:#b08000;">0x2</span>;
         <span style="color:#0057ae;">double</span> f = <span style="color:#b08000;">.4e+49</span>;
+        
+        <span style="color:#0057ae;">long</span> int_dec = <span style="color:#b08000;">1__23_48l</span>;
+        <span style="color:#0057ae;">long</span> int_oct = <span style="color:#b08000;">072034__4l</span>;
+        <span style="color:#0057ae;">long</span> int_hex = <span style="color:#b08000;">0xa__12Ff_13L</span>;
+        <span style="color:#0057ae;">int</span> int_bin = <span style="color:#b08000;">0B1011___01</span>;
+        
+        <span style="color:#0057ae;">double</span> float_hex = <span style="color:#b08000;">0x1f__a2.d_f10P+1074D</span>;
+        <span style="color:#0057ae;">float</span> float_dec = <span style="color:#b08000;">1__24.1_32e-1____23F</span>;
+        <span style="color:#0057ae;">float</span>[] float_d = {<span style="color:#b08000;">1.</span>,<span style="color:#b08000;">1.E+3</span>,<span style="color:#b08000;">1.E+3f</span>,<span style="color:#b08000;">1.F</span>,<span style="color:#b08000;">1.1E+3d</span>,<span style="color:#b08000;">1.1E+3</span>,<span style="color:#b08000;">1.1f</span>,<span style="color:#b08000;">1.</span><span style="color:#b08000;">1</span>,<span style="color:#b08000;">.1E+3f</span>,<span style="color:#b08000;">.1E+3</span>,<span style="color:#b08000;">.1f</span>,<span style="color:#b08000;">.1</span>,<span style="color:#b08000;">1E+3f</span>,<span style="color:#b08000;">1E+3</span>,<span style="color:#b08000;">1f</span>,<span style="color:#b08000;">1d</span>};
     }
 }
 </pre></body></html>
diff --git a/autotests/input/highlight.java b/autotests/input/highlight.java
--- a/autotests/input/highlight.java
+++ b/autotests/input/highlight.java
@@ -35,5 +35,14 @@
         int num = 1;
         num = 0x2;
         double f = .4e+49;
+        
+        long int_dec = 1__23_48l;
+        long int_oct = 072034__4l;
+        long int_hex = 0xa__12Ff_13L;
+        int int_bin = 0B1011___01;
+        
+        double float_hex = 0x1f__a2.d_f10P+1074D;
+        float float_dec = 1__24.1_32e-1____23F;
+        float[] float_d = {1.,1.E+3,1.E+3f,1.F,1.1E+3d,1.1E+3,1.1f,1.1,.1E+3f,.1E+3,.1f,.1,1E+3f,1E+3,1f,1d};
     }
 }
diff --git a/autotests/reference/highlight.java.ref b/autotests/reference/highlight.java.ref
--- a/autotests/reference/highlight.java.ref
+++ b/autotests/reference/highlight.java.ref
@@ -35,5 +35,14 @@
 <Normal Text>        </Normal Text><Data Type>int</Data Type><Normal Text> num </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Decimal>1</Decimal><Symbol>;</Symbol><br/>
 <Normal Text>        num </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Hex>0x2</Hex><Symbol>;</Symbol><br/>
 <Normal Text>        </Normal Text><Data Type>double</Data Type><Normal Text> f </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Float>.4e+49</Float><Symbol>;</Symbol><br/>
+<Normal Text>        </Normal Text><br/>
+<Normal Text>        </Normal Text><Data Type>long</Data Type><Normal Text> int_dec </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Decimal>1__23_48l</Decimal><Symbol>;</Symbol><br/>
+<Normal Text>        </Normal Text><Data Type>long</Data Type><Normal Text> int_oct </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Octal>072034__4l</Octal><Symbol>;</Symbol><br/>
+<Normal Text>        </Normal Text><Data Type>long</Data Type><Normal Text> int_hex </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Hex>0xa__12Ff_13L</Hex><Symbol>;</Symbol><br/>
+<Normal Text>        </Normal Text><Data Type>int</Data Type><Normal Text> int_bin </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Binary>0B1011___01</Binary><Symbol>;</Symbol><br/>
+<Normal Text>        </Normal Text><br/>
+<Normal Text>        </Normal Text><Data Type>double</Data Type><Normal Text> float_hex </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Float>0x1f__a2.d_f10P+1074D</Float><Symbol>;</Symbol><br/>
+<Normal Text>        </Normal Text><Data Type>float</Data Type><Normal Text> float_dec </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Float>1__24.1_32e-1____23F</Float><Symbol>;</Symbol><br/>
+<Normal Text>        </Normal Text><Data Type>float</Data Type><Symbol>[]</Symbol><Normal Text> float_d </Normal Text><Symbol>=</Symbol><Normal Text> </Normal Text><Symbol>{</Symbol><Float>1.</Float><Symbol>,</Symbol><Float>1.E+3</Float><Symbol>,</Symbol><Float>1.E+3f</Float><Symbol>,</Symbol><Float>1.F</Float><Symbol>,</Symbol><Float>1.1E+3d</Float><Symbol>,</Symbol><Float>1.1E+3</Float><Symbol>,</Symbol><Float>1.1f</Float><Symbol>,</Symbol><Float>1.</Float><Decimal>1</Decimal><Symbol>,</Symbol><Float>.1E+3f</Float><Symbol>,</Symbol><Float>.1E+3</Float><Symbol>,</Symbol><Float>.1f</Float><Symbol>,</Symbol><Float>.1</Float><Symbol>,</Symbol><Float>1E+3f</Float><Symbol>,</Symbol><Float>1E+3</Float><Symbol>,</Symbol><Float>1f</Float><Symbol>,</Symbol><Float>1d</Float><Symbol>};</Symbol><br/>
 <Normal Text>    </Normal Text><Symbol>}</Symbol><br/>
 <Symbol>}</Symbol><br/>
diff --git a/data/syntax/java.xml b/data/syntax/java.xml
--- a/data/syntax/java.xml
+++ b/data/syntax/java.xml
@@ -1,6 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE language SYSTEM "language.dtd">
-<language name="Java" version="4" kateversion="5.0" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
+<!DOCTYPE language SYSTEM "language.dtd"
+[
+	<!ENTITY int "[0-9]([0-9_]*[0-9])?">
+	<!ENTITY hex "[0-9a-fA-F]([0-9a-fA-F_]*[0-9a-fA-F])?">
+]>
+<language name="Java" version="5" kateversion="5.0" section="Sources" extensions="*.java" mimetype="text/x-java" license="LGPL" author="Alfredo Luiz Foltran Fialho (alfoltran@ig.com.br)">
 	<highlighting>
 		<list name="java15">
 			<item>ACTIVE</item>
@@ -3760,14 +3764,13 @@
 				<keyword attribute="Keyword" context="#stay" String="keywords"/>
 				<keyword attribute="Data Type" context="#stay" String="types"/>
 				<keyword attribute="Java15" context="#stay" String="java15"/>
-				<Float attribute="Float" context="#stay">
-					<AnyChar String="fF" attribute="Float" context="#stay"/>
-				</Float>
-				<HlCOct attribute="Octal" context="#stay"/>
-				<HlCHex attribute="Hex" context="#stay"/>
-				<Int attribute="Decimal" context="#stay">
-					<StringDetect attribute="Decimal" context="#stay" String="L" insensitive="true"/>
-				</Int>
+				<RegExpr attribute="Float" context="#stay" String="(\b&int;\.?|(\b&int;)?\.&int;)([eE][\-\+]?&int;[fFdD]?|[fFdD])\b"/>
+				<RegExpr attribute="Float" context="#stay" String="(\b&int;\.|(\b&int;)?\.&int;\b)"/>
+				<RegExpr attribute="Float" context="#stay" String="\b0[xX](&hex;\.?|(&hex;)?\.&hex;)[pP][\-\+]?&int;[fFdD]?\b"/>
+				<RegExpr attribute="Hex" context="#stay" String="\b0[xX]&hex;[lL]?\b"/>
+				<RegExpr attribute="Binary" context="#stay" String="\b0[bB][01]([01_]*[01])?[lL]?\b"/>
+				<RegExpr attribute="Octal" context="#stay" String="\b0[0-7]([0-7_]*[0-7])?[lL]?\b"/>
+				<RegExpr attribute="Decimal" context="#stay" String="\b(0|[1-9]([0-9_]*[0-9])?)[lL]?\b"/>
 				<HlCChar attribute="Char" context="#stay"/>
 				<RegExpr attribute="Char" context="#stay" String="'\\u[0-9a-fA-F]{4}'"/>
 				<RegExpr attribute="Decimal" context="#stay" String="//\s*BEGIN.*$" beginRegion="Region1"/>
@@ -3841,6 +3844,7 @@
 			<itemData name="Decimal"      defStyleNum="dsDecVal" spellChecking="false"/>
 			<itemData name="Octal"        defStyleNum="dsBaseN" spellChecking="false"/>
 			<itemData name="Hex"          defStyleNum="dsBaseN" spellChecking="false"/>
+			<itemData name="Binary"       defStyleNum="dsBaseN" spellChecking="false"/>
 			<itemData name="Float"        defStyleNum="dsFloat" spellChecking="false"/>
 			<itemData name="Char"         defStyleNum="dsChar" spellChecking="false"/>
 			<itemData name="String"       defStyleNum="dsString"/>