diff --git a/ChangeLog.txt b/ChangeLog.txt
index 27005cbeb9..d58d8f0359 100644
--- a/ChangeLog.txt
+++ b/ChangeLog.txt
@@ -10,6 +10,10 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2016-01-18 12:37 UTC+0100 Maurilio Longo (maurilio.longo@libero.it)
+  + tests/longfile.prg
+    + create a .dbf file bigger than 2GB and test index operations on it.
+
 2016-01-18 12:16 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * ChangeLog.txt
     * indenting
@@ -357,12 +361,12 @@
     ! fixed SYS( 10 ) to return date as character string
 
 2016-01-07 12:16 UTC-0800 Pritpal Bedi (bedipritpal/at/hotmail.com)
-  * contrib/gtwvg/wvgcore.c 
+  * contrib/gtwvg/wvgcore.c
   * contrib/gtwvg/wvgcuig.c
-    ! Fixed ( again ) Wvt_DrawImage() and Wvg_Image() where images were not 
+    ! Fixed ( again ) Wvt_DrawImage() and Wvg_Image() where images were not
       being rendered correctly if the height of image is greater than
       width of the image. The behavior is only affected when <bDoNotScale>
-      is set to be TRUE. Thanks Sergy for reporting and providing 
+      is set to be TRUE. Thanks Sergy for reporting and providing
       code to debug.
 
 2016-01-05 10:04 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
@@ -439,14 +443,14 @@
       called
 
 2016-01-03 09:24 UTC-0800 Pritpal Bedi (bedipritpal/at/hotmail.com)
-  * contrib/gtwvg/wvgcore.c 
+  * contrib/gtwvg/wvgcore.c
   * contrib/gtwvg/wvgcuig.c
-    ! Fixed Wvt_DrawImage() and Wvg_Image() where images were not 
-	   being rendered correctly if the height of image is greater than
-	   width of the image. The behavior is only affected when <bDoNotScale>
-	   is set to be TRUE. Thanks Sergy for reporting and providing 
-	   code to debug.
-	
+    ! Fixed Wvt_DrawImage() and Wvg_Image() where images were not
+      being rendered correctly if the height of image is greater than
+      width of the image. The behavior is only affected when <bDoNotScale>
+      is set to be TRUE. Thanks Sergy for reporting and providing
+      code to debug.
+
 2015-12-29 20:16 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * include/hbcomp.h
   * include/hbcompdf.h
diff --git a/tests/longfile.prg b/tests/longfile.prg
new file mode 100644
index 0000000000..6313a959ba
--- /dev/null
+++ b/tests/longfile.prg
@@ -0,0 +1,44 @@
+/* Test creation of a .dbf file bigger than 2GB */
+
+
+function main()
+
+   local aStruct := { { "FIELD1", "C", 256, 0 },;
+                      { "FIELD2", "C", 256, 0 },;
+                      { "FIELD3", "C", 256, 0 },;
+                      { "FIELD4", "C", 256, 0 } }
+   local nRec
+   local i
+   local cFileName := "testdbf"
+   local nTotalRecs := 5000000
+
+   REQUEST DBFCDX
+   RddSetDefault( "DBFCDX" )
+
+   dbCreate( cFileName, aStruct )
+   dbUseArea( .T.,, cFileName, "long", .F. )
+   OrdCreate( cFileName + IndexExt(),, "Left( field->FIELD1, 30 )" )
+
+   for nRec := 1 to nTotalRecs
+      long->( dbAppend() )
+      long->FIELD1 := PadL( nRec, 30, Space( 1 ) )
+   next
+
+   ? "File size is : " + Transform( FileSize( cFileName + ".dbf" ), "@ZE ###,###,###,###" )
+   ? "Index size is: " + Transform( FileSize( cFileName + IndexExt() ), "@ZE ###,###,###,###" )
+
+   ? "Testing index..."
+   for nRec := 1 to nTotalRecs / 10
+      if ! long->( dbSeek( PadL( nRec, 30, Space( 1 ) ) ) )
+         ? "Seek on value " + LTrim( Str( nRec ) ) + " failed!!"
+      endif
+   next
+   ? "Index test ended"
+   ? "Press any key..."
+   Inkey( 0 )
+
+   long->( dbCloseArea() )
+   fErase( cFileName + ".dbf" )
+   fErase( cFileName + IndexExt() )
+
+return 0