diff --git a/regexp.spec b/regexp.spec
index ce11ea4..1fe36dd 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -1,28 +1,61 @@
-%define name		regexp
+# 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 full_name	jakarta-%{name}
-%define version		1.3
-%define release 	2jpp_9fc
 %define section		free
 
-Name:           %{name}
-Version:        %{version}
-Release: 	%{release}
+Name:           regexp
+Version:        1.4
+Release:        2jpp.1
 Epoch:          0
 Summary:        Simple regular expressions API
 License:        Apache Software License
 Group:          Development/Libraries/Java
 Url:            http://jakarta.apache.org/%{name}/
-Source0:        jakarta-regexp-%{version}-RHCLEAN.tar.bz2
-BuildRequires:  jpackage-utils >= 0:1.5
-BuildRequires:  ant >= 0:1.6
-BuildRequires:  coreutils
+Source0:        jakarta-regexp-%{version}-RHCLEAN.tar.gz
+BuildRequires:  jpackage-utils >= 0:1.6
+BuildRequires:  ant >= 1.6
+%if ! %{gcj_support}
+Buildarch:      noarch
+%endif
 Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
-# RHEL3 and FC2
-Obsoletes:	%{full_name} <= 0:1.2
-# libgcj aot-compiled native libraries
-BuildRequires:    java-gcj-compat-devel >= 1.0.31
-Requires(post):   java-gcj-compat >= 1.0.31
-Requires(postun): java-gcj-compat >= 1.0.31
+
+%if %{gcj_support}
+BuildRequires:		java-gcj-compat-devel
+Requires(post):		java-gcj-compat
+Requires(postun):	java-gcj-compat
+%endif
 
 %description
 Regexp is a 100% Pure Java Regular Expression package that was
@@ -35,7 +68,9 @@ for visual debugging and testing suite for compatibility.
 %package javadoc
 Group:          Development/Java
 Summary:        Javadoc for %{name}
-Prereq: coreutils
+Requires(post): %{__rm}
+Requires(postun): %{__rm}
+Requires(post): /bin/ln
 
 %description javadoc
 Javadoc for %{name}.
@@ -50,6 +85,7 @@ find . -name "*.jar" -exec rm -f {} \;
 mkdir lib
 ant -Djakarta-site2.dir=. jar javadocs
 
+
 %install
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
@@ -60,21 +96,13 @@ install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
 rm -rf docs/api
 
-aot-compile-rpm
+%if %{gcj_support}
+%{_bindir}/aot-compile-rpm
+%endif
 
 %clean
 rm -rf $RPM_BUILD_ROOT
 
-%pre
-rm -f %{_javadir}/%{full_name}.jar
-rm -f %{_javadir}/%{name}.jar
-
-%post
-%{_bindir}/rebuild-gcj-db
-
-%postun
-%{_bindir}/rebuild-gcj-db
-
 %post javadoc
 rm -f %{_javadocdir}/%{name}
 ln -s %{name}-%{version} %{_javadocdir}/%{name}
@@ -84,17 +112,40 @@ if [ "$1" = "0" ]; then
     rm -f %{_javadocdir}/%{name}
 fi
 
+%if %{gcj_support}
+%post
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
+%if %{gcj_support}
+%postun
+if [ -x %{_bindir}/rebuild-gcj-db ]
+then
+  %{_bindir}/rebuild-gcj-db
+fi
+%endif
+
 %files
 %defattr(0644,root,root,0755)
-%doc LICENSE.txt
+%doc LICENSE
 %{_javadir}/*.jar
+
+%if %{gcj_support}
 %attr(-,root,root) %{_libdir}/gcj/%{name}
+%endif
 
 %files javadoc
 %defattr(0644,root,root,0755)
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Fri Aug 4 2006 Vivek Lakshmanan <vivekl@redhat.com> 0:1.4-2jpp.1
+- Merge with latest from JPP.
+- Remove prebuilt jars from new source tar ball.
+
 * Sat Jul 22 2006 Jakub Jelinek <jakub@redhat.com> - 0:1.3-2jpp_9fc
 - Rebuilt