diff --git a/.cvsignore b/.cvsignore
index 71a62d6..a9b1964 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jzlib-1.0.5.tar.gz
+jzlib-1.0.7.tar.gz
diff --git a/jzlib.spec b/jzlib.spec
index e4545db..1d68ce0 100644
--- a/jzlib.spec
+++ b/jzlib.spec
@@ -1,20 +1,63 @@
+# Copyright (c) 2000-2005, JPackage Project
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+#
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the
+#    distribution.
+# 3. Neither the name of the JPackage Project nor the names of its
+#    contributors may be used to endorse or promote products derived
+#    from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+#
+
+%define _with_gcj_support 1
+
+%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}}
+
 %define section   free
 
 Name:           jzlib
-Version:        1.0.5
-Release: 2jpp_4fc
+Version:        1.0.7
+Release:        3jpp_1fc
 Epoch:          0
 Summary:        JZlib re-implementation of zlib in pure Java
 
 Group:          Development/Libraries/Java
 License:        BSD-style
 URL:            http://www.jcraft.com/jzlib/
-Source0:        http://www.jcraft.com/jzlib/jzlib-1.0.5.tar.gz
+Source0:        http://www.jcraft.com/jzlib/jzlib-1.0.7.tar.gz
 Source1:        %{name}_build.xml
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
 
+%if ! %{gcj_support}
 BuildArch:      noarch
-BuildRequires:  jpackage-utils >= 0:1.5.31, ant >= 0:1.5.4
+%endif
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant >= 0:1.6
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 The zlib is designed to be a free, general-purpose, legally unencumbered 
@@ -26,7 +69,6 @@ The zlib was written by Jean-loup Gailly (compression) and Mark Adler
 %package        javadoc
 Summary:        Javadoc for %{name}
 Group:          Development/Documentation
-Prereq: coreutils
 
 %description    javadoc
 %{summary}.
@@ -34,7 +76,6 @@ Prereq: coreutils
 %package        demo
 Summary:        Examples for %{name}
 Group:          Development/Libraries/Java
-Prereq: coreutils
 
 %description    demo
 %{summary}.
@@ -67,6 +108,10 @@ cp -pr example/* $RPM_BUILD_ROOT%{_datadir}/%{name}-%{version}
 ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_datadir}/%{name} # ghost symlink
 
 
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
+
 %clean
 rm -rf $RPM_BUILD_ROOT
 
@@ -80,11 +125,31 @@ rm -f %{_datadir}/%{name}
 ln -s %{name}-%{version} %{_datadir}/%{name}
 
 
+%post
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%postun
+%if %{gcj_support}
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
 %{_javadir}/*.jar
 %doc LICENSE.txt
 
+%if %{gcj_support}
+%attr(-,root,root) %{_libdir}/gcj/%{name}/jzlib-1.0.7.jar.*
+%endif
+
 %files javadoc
 %defattr(0644,root,root,0755)
 %doc %{_javadocdir}/%{name}-%{version}
@@ -96,6 +161,9 @@ ln -s %{name}-%{version} %{_datadir}/%{name}
 %ghost %doc %{_datadir}/%{name}
 
 %changelog
+* Sat Jul 22 2006 Vivek Lakshmanan <vivekl@redhat.com> - 0:1.0.7-3jpp_1fc
+- Merge with latest version from JPP.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.0.5-2jpp_4fc
 - Rebuilt
 
diff --git a/sources b/sources
index 9ddc6de..b1aa076 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-8880066f474d94b6a629502e32ffafb8  jzlib-1.0.5.tar.gz
+3c52a0afb970e8a1fb2d34f30d330a83  jzlib-1.0.7.tar.gz