diff --git a/mapserver.spec b/mapserver.spec
index b79f9ba..5651607 100644
--- a/mapserver.spec
+++ b/mapserver.spec
@@ -7,25 +7,14 @@ Source:         %{name}-%{version}.tar.gz
 URL:            http://mapserver.gis.umn.edu
 Summary:        Environment for building spatially-enabled internet applications
 Packager:       Otto Dassau <otto.dassau@gmx.de>
-Requires:       xorg-x11-libXpm
-Requires:  	php5
+Requires:       php
 Requires:       postgresql
 Requires:       mysql
-Requires:       libgeos
-Requires:       libproj
-Requires:       libgdal
-Requires:       freetype2
-Requires:  	gd
 #Requires:       python
-Requires:      	zlib
-Requires:       libxml2
-Requires:       libjpeg
-Requires:       libpng
-Requires:       libtiff
 #Requires:       httpd
 BuildRequires:  xorg-x11-libXpm-devel
-BuildRequires:  php5-devel
-BuildRequires:	rpm, gcc, gcc-c++
+BuildRequires:  php-devel
+BuildRequires:  rpm, gcc, gcc-c++
 BuildRequires:  postgresql-devel
 BuildRequires:  mysql-devel
 BuildRequires:  libgeos-devel
@@ -34,7 +23,11 @@ BuildRequires:  libgdal-devel
 BuildRequires:  freetype2-devel
 BuildRequires:  gd-devel >= 2.0.16
 #BuildRequires:  python-devel
+%if 0%{?suse_version} >= 1030
 BuildRequires:  libcurl-devel
+%else
+BuildRequires:  curl-devel
+%endif
 BuildRequires:  zlib-devel
 BuildRequires:  libxml2-devel
 BuildRequires:  libjpeg-devel
@@ -42,11 +35,7 @@ BuildRequires:  libpng-devel
 BuildRequires:  libtiff-devel
 BuildRequires:  perl(ExtUtils::MakeMaker)
 BuildRequires:  swig
-#%if 0%{?suse_version} >= 1030
-#BuildRequires:  java-1_6_0-sun-devel
-#%else
-#BuildRequires:  java-1_5_0-sun-devel
-#%endif
+BuildRequires:  java-devel >= 1.5
 #BuildRequires:  httpd-devel
 BuildRequires:  java
 BuildRequires:  libgcj-devel
@@ -89,15 +78,14 @@ within the Perl programming language.
 #The Python/Mapscript extension provides full map customization capabilities
 #within the Python programming language.
 
-##java is not available in build repos - only in non-oss repo, so it won't be build
-#%package java
-#Summary:        Java/Mapscript map making extensions to Java
-#Group:          Development/Languages
-#Requires:       %{name} = %{version}-%{release}
+%package java
+Summary:        Java/Mapscript map making extensions to Java
+Group:          Development/Languages
+Requires:       %{name} = %{version}-%{release}
 
-#%description java
-#The Java/Mapscript extension provides full map customization capabilities
-#within the Java programming language.
+%description java
+The Java/Mapscript extension provides full map customization capabilities
+within the Java programming language.
 
 %prep
 %setup -q
@@ -158,9 +146,9 @@ make
 #python setup.py build
 
 # build java
-#cd ../java
-#make interface
-#make
+cd ../java
+make interface
+make
 
 %install
 rm -rf %{buildroot}
@@ -188,8 +176,8 @@ popd
 #popd
 
 # install java
-#mkdir -p %{buildroot}%{_javadir}
-#install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
+mkdir -p %{buildroot}%{_javadir}
+install -p -m 644 mapscript/java/mapscript.jar %{buildroot}%{_javadir}/
 
 # install php config file
 mkdir -p %{buildroot}%{_sysconfdir}/php.d/
@@ -247,12 +235,12 @@ rm -rf %{buildroot}
 #/usr/local/lib64/python2.5/site-packages/*
 ##%{python_sitearch}/*
 
-#%files java
-#%defattr(-,root,root)
-#%doc mapscript/java/README
-#%doc mapscript/java/examples
-#%doc mapscript/java/tests
-#%{_javadir}/*.jar
+%files java
+%defattr(-,root,root)
+%doc mapscript/java/README
+%doc mapscript/java/examples
+%doc mapscript/java/tests
+%{_javadir}/*.jar
 
 %changelog
 * Sun Mar 16 2008 Otto Dassau 5.0.2