diff --git a/.cvsignore b/.cvsignore
index 7197b16..25c866e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-libgda-4.0.5.tar.bz2
+libgda-4.0.6.tar.bz2
diff --git a/libgda.spec b/libgda.spec
index 2e67d52..8291c3e 100644
--- a/libgda.spec
+++ b/libgda.spec
@@ -24,7 +24,7 @@
 %define           POSTGRES 1
 %define           FREETDS  0
 %define           XBASE    0
-%define           JAVA     0
+%define           JAVA     1
 
 %{?_with_db2:%define IBMDB2     1}
 %{?_with_oracle:%define ORACLE  1}
@@ -40,7 +40,7 @@
 
 Name:             libgda
 Epoch:            1
-Version:          4.0.5
+Version:          4.0.6
 Release:          1%{?dist}
 Summary:          Library for writing gnome database programs
 Group:            System Environment/Libraries
@@ -100,6 +100,10 @@ BuildRequires:    openldap-devel
 BuildRequires:    xbase-devel
 %endif
 
+%if %{JAVA}
+BuildRequires:    java-1.6.0-openjdk-devel
+%endif
+
 %description
 libgda is a library that eases the task of writing
 gnome database programs.
@@ -323,6 +327,22 @@ Requires:         %{name}-xbase = %{epoch}:%{version}-%{release}, pkgconfig
 This package includes the pkgconfig file for the libgda XBASE provider.
 %endif
 
+%if %{JAVA}
+%package java
+Summary:          Java JDBC provider for libgda
+Group:            System Environment/Libraries
+Requires:         %{name} = %{epoch}:%{version}-%{release}
+%description java
+This package includes the GDA Java JDBC provider.
+
+%package java-devel
+Summary:          Java JDBC provider for libgda pkgconfig file
+Group:            Development/Libraries
+Requires:         %{name}-java = %{epoch}:%{version}-%{release}, pkgconfig
+%description java-devel
+This package includes the pkgconfig file for the libgda Java JDBC provider.
+%endif
+
 
 %prep
 %setup -q
@@ -337,7 +357,7 @@ touch `find -name Makefile.in`
 
 
 %build
-CONFIG="--disable-static --disable-dependency-tracking --enable-system-sqlite"
+CONFIG="--disable-static --disable-dependency-tracking --enable-system-sqlite --with-libsoup"
 
 %if %{FREETDS}
 CONFIG="$CONFIG --with-tds"
@@ -573,8 +593,23 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/pkgconfig/libgda-xbase-4.0.pc
 %endif
 
+%if %{JAVA}
+%files java
+%defattr(-,root,root)
+%{_libdir}/libgda-4.0/providers/libgda-jdbc.so
+%{_libdir}/libgda-4.0/providers/gdaprovider-4.0.jar
+
+%files java-devel
+%defattr(-,root,root,-)
+%{_libdir}/pkgconfig/libgda-jdbc-4.0.pc
+%endif
+
 
 %changelog
+* Mon Jan 18 2010 Denis Leroy <denis@poolshark.org> - 1:4.0.6-1
+- Update to upstream 4.0.6
+- Added Java JDBC provider subpackage 
+
 * Sat Nov  7 2009 Denis Leroy <denis@poolshark.org> - 1:4.0.5-1
 - Update to upstream 4.0.5
 - Source URL fix
diff --git a/sources b/sources
index 3aacba7..faf210e 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-c61dbbc85479d3de4371ee16da922124  libgda-4.0.5.tar.bz2
+950dbb0c6e85937186abd159e4ed70d2  libgda-4.0.6.tar.bz2