diff --git a/vtk-libpng-1.4.0.patch b/vtk-libpng-1.4.0.patch
new file mode 100644
index 0000000..82a3157
--- /dev/null
+++ b/vtk-libpng-1.4.0.patch
@@ -0,0 +1,20 @@
+--- VTK/IO/vtkPNGReader.cxx.orig	2010-02-04 01:49:09.000000000 +0100
++++ VTK/IO/vtkPNGReader.cxx	2010-02-04 01:52:56.000000000 +0100
+@@ -116,7 +116,7 @@
+   // minimum of a byte per pixel
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) 
+     {
+-    png_set_gray_1_2_4_to_8(png_ptr);
++    png_set_expand_gray_1_2_4_to_8(png_ptr);
+     }
+ 
+   // add alpha if any alpha found
+@@ -225,7 +225,7 @@
+   // minimum of a byte per pixel
+   if (color_type == PNG_COLOR_TYPE_GRAY && bit_depth < 8) 
+     {
+-    png_set_gray_1_2_4_to_8(png_ptr);
++    png_set_expand_gray_1_2_4_to_8(png_ptr);
+     }
+ 
+   // add alpha if any alpha found
diff --git a/vtk.spec b/vtk.spec
index 4757bd3..04ad4ad 100644
--- a/vtk.spec
+++ b/vtk.spec
@@ -10,6 +10,9 @@ URL:		http://www.vtk.org
 Source0:	vtk-%{version}.tar.gz
 Patch0:         vtk-5.4.2-pythondestdir.patch
 Patch1:		vtk-5.4.2-string-len.patch
+%if 0%{?suse_version} >= 1130
+Patch2:		vtk-libpng-1.4.0.patch
+%endif
 Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
 BuildRequires:	cmake tcl-devel tk-devel libqt4-devel python-devel
@@ -21,6 +24,7 @@ BuildRequires:	chrpath
 %if 0%{?suse_version} >= 1110
 BuildRequires:  freeglut-devel
 %endif
+BuildRequires:  java-devel
 
 %description 
 VTK is an open-source software system for image processing, 3D
@@ -59,6 +63,14 @@ Provides:	vtk-python
 %description -n python-vtk
 python bindings for VTK
 
+%package java
+Summary:	Java VTK bindings
+Requires:	vtk = %{version}
+Group:		Development/Libraries/Java
+
+%description java
+The Java-bindings for VTK
+
 %package qt
 Summary:	QT VTK widget
 Requires:	vtk = %{version}
@@ -92,6 +104,9 @@ Testing programs for VTK
 %setup -n VTK -q
 %patch0 -p1
 %patch1 -p1
+%if 0%{?suse_version} >= 1130
+%patch2 -p1
+%endif
 
 # Replace relative path ../../../VTKData with %{_datadir}/vtkdata
 # otherwise it will break on symlinks.
@@ -112,6 +127,7 @@ cmake . \
 	-DVTK_DATA_ROOT:PATH=%{_datadir}/%{name}-data \
 	-DVTK_WRAP_PYTHON:BOOL=ON \
 	-DVTK_WRAP_TCL:BOOL=ON \
+	-DVTK_WRAP_JAVA:BOOL=ON \
 	-DVTK_USE_PARALLEL:BOOL=ON \
 	-DVTK_USE_RENDERING:BOOL=ON \
 	-DBUILD_DOCUMENTATION:BOOL=OFF \
@@ -239,6 +255,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %post qt -p /sbin/ldconfig
 
+%post java -p /sbin/ldconfig
+
 %postun -p /sbin/ldconfig
 
 %postun tcl -p /sbin/ldconfig
@@ -247,6 +265,8 @@ rm -rf $RPM_BUILD_ROOT
 
 %postun qt -p /sbin/ldconfig
 
+%postun java -p /sbin/ldconfig
+
 %files
 %defattr(-,root,root)
 %{_libdir}/libvtkCommon.so.*
@@ -304,6 +324,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libvtkexoIIc.so
 %{_libdir}/libvtk*TCL.so
 %{_libdir}/libvtk*Python*.so
+%{_libdir}/libvtk*Java*.so
 %{_libdir}/libQVTK.so
 %{_libdir}/libvtkInfovis.so
 %{_libdir}/libvtkViews.so
@@ -361,11 +382,22 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{qtdir}/plugins/designer
 %{qtdir}/plugins/designer/libQVTKWidgetPlugin.so
 
+%files java
+%defattr(-,root,root,-)
+%dir %{_libdir}/java/vtk
+%{_libdir}/java/vtk/vtk.jar
+%{_libdir}/libvtk*Java.so.*
+%{_bindir}/vtkWrapJava
+
 %files examples
 %defattr(-,root,root,-)
 %{_datadir}/%{name}-examples
 
 %changelog
+* Sat Mai 08 2010 Werner Hoch  <werner.ho@gmx.de> - 5.4.2
+- applied patches provided by Marcel Witte <wittemar@googlemail.com>
+- enable java bindings
+- patch to fix png-support for factory
 * Mon Jun 08 2009 Andrea Florio <andrea@opensuse.org> - 5.4.2
 - made rpmlint happy (using fdupes)
 - fixed rpm Group using real ones, please check here: http://en.opensuse.org/SUSE_Package_Conventions/RPM_Groups