diff --git a/.cvsignore b/.cvsignore
index ddf6800..825d47e 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jakarta-regexp-1.4-RHCLEAN.tar.gz
+jakarta-regexp-1.4.tar.gz
diff --git a/regexp.spec b/regexp.spec
index 3210957..223a7c3 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -32,19 +32,22 @@
 
 %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 section		free
+%define full_name       jakarta-%{name}
+%define section         free
 
 Name:           regexp
 Version:        1.4
-Release:        2jpp.2
+Release:        3jpp.1%{dist}
 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.gz
+Source0:        http://www.apache.org/dist/jakarta/regexp/jakarta-regexp-%{version}.tar.gz
 BuildRequires:  jpackage-utils >= 0:1.6
+Requires(pre):     jpackage-utils >= 0:1.6
+Requires(postun):  jpackage-utils >= 0:1.6
+
 BuildRequires:  ant >= 1.6
 %if ! %{gcj_support}
 Buildarch:      noarch
@@ -52,9 +55,9 @@ Buildarch:      noarch
 Buildroot:      %{_tmppath}/%{name}-%{version}-buildroot
 
 %if %{gcj_support}
-BuildRequires:		java-gcj-compat-devel
-Requires(post):		java-gcj-compat
-Requires(postun):	java-gcj-compat
+BuildRequires:          java-gcj-compat-devel
+Requires(post):         java-gcj-compat
+Requires(postun):       java-gcj-compat
 %endif
 
 %description
@@ -76,7 +79,6 @@ Requires(post): /bin/ln
 Javadoc for %{name}.
 
 %prep
-rm -rf $RPM_BUILD_ROOT
 %setup -q -n %{full_name}-%{version}
 # remove all binary libs
 find . -name "*.jar" -exec rm -f {} \;
@@ -87,6 +89,8 @@ ant -Djakarta-site2.dir=. jar javadocs
 
 
 %install
+rm -rf $RPM_BUILD_ROOT
+
 # jars
 install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
 install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
@@ -142,6 +146,11 @@ fi
 %{_javadocdir}/%{name}-%{version}
 
 %changelog
+* Thu Feb 8 2007 Vivek Lakshmanan <vivekl at redhat.com> 0:1.4-3jpp.1.fc7
+- Resync with JPP
+- Use the upstream tar ball as JPP does since they clean it off jars anyway
+- Use JPackage exception compliant naming scheme
+
 * Fri Aug 4 2006 Vivek Lakshmanan <vivekl@redhat.com> 0:1.4-2jpp.2
 - Rebuild.
 
diff --git a/sources b/sources
index af4f8f3..3d668db 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-3869ec6a6b7ad1c139f2e39219e509ec  jakarta-regexp-1.4-RHCLEAN.tar.gz
+d903d84c949df848009f3bf205b32c97  jakarta-regexp-1.4.tar.gz