diff --git a/.cvsignore b/.cvsignore
index 825d47e..3acc72b 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jakarta-regexp-1.4.tar.gz
+jakarta-regexp-1.5.tar.gz
diff --git a/regexp.spec b/regexp.spec
index a4f0f4e..ca3531a 100644
--- a/regexp.spec
+++ b/regexp.spec
@@ -32,32 +32,32 @@
 
 %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 full_name	jakarta-%{name}
 
-Name:           regexp
-Version:        1.4
-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:        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
-Requires:       java
+Name:		regexp
+Version:	1.5
+Release:	1jpp.1%{dist}
+Epoch:		0
+Summary:	Simple regular expressions API
+License:	ASL 2.0
+Group:		Development/Libraries/Java
+Url:		http://jakarta.apache.org/%{name}/
+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
+Requires:	java
 
-BuildRequires:  ant >= 1.6
+BuildRequires:	ant >= 1.6
 %if ! %{gcj_support}
-Buildarch:      noarch
+Buildarch:	noarch
 %endif
-Buildroot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
+Buildroot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 %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
@@ -69,11 +69,11 @@ It includes complete Javadoc documentation as well as a simple Applet
 for visual debugging and testing suite for compatibility.
 
 %package javadoc
-Group:          Development/Java
-Summary:        Javadoc for %{name}
-Requires(post): %{__rm}
-Requires(postun): %{__rm}
-Requires(post): /bin/ln
+Group:		Development/Java
+Summary:	Javadoc for %{name}
+Requires(post):	%{__rm}
+Requires(postun):	%{__rm}
+Requires(post):	/bin/ln
 
 %description javadoc
 Javadoc for %{name}.
@@ -89,24 +89,24 @@ ant -Djakarta-site2.dir=. jar javadocs
 
 
 %install
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 # jars
-install -d -m 755 $RPM_BUILD_ROOT%{_javadir}
-install -m 644 build/*.jar $RPM_BUILD_ROOT%{_javadir}/%{name}-%{version}.jar
-(cd $RPM_BUILD_ROOT%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
+install -d -m 755 %{buildroot}%{_javadir}
+install -m 644 build/*.jar %{buildroot}%{_javadir}/%{name}-%{version}.jar
+(cd %{buildroot}%{_javadir} && for jar in *-%{version}*; do ln -sf ${jar} `echo $jar| sed  "s|-%{version}||g"`; done)
 # javadoc
-install -d -m 755 $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}
-cp -r docs/api/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
-rm -rf docs/api
+install -d -m 755 %{buildroot}%{_javadocdir}/%{name}-%{version}
+ln -s %{name}-%{version} %{buildroot}%{_javadocdir}/%{name}
+%{__cp} -r docs/api/* %{buildroot}%{_javadocdir}/%{name}-%{version}
+%{__rm} -rf docs/api
 
 %if %{gcj_support}
 %{_bindir}/aot-compile-rpm
 %endif
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+rm -rf %{buildroot}
 
 %post javadoc
 rm -f %{_javadocdir}/%{name}
@@ -148,6 +148,11 @@ fi
 %ghost %doc %{_javadocdir}/%{name}
 
 %changelog
+* Sat Feb 9 2008 Devrim GUNDUZ <devrim@commandprompt.com> 0:1.5-1jpp.1
+- Update to 1.5
+- Fix license
+- Cosmetic cleanup
+
 * 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
diff --git a/sources b/sources
index 3d668db..2586585 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-d903d84c949df848009f3bf205b32c97  jakarta-regexp-1.4.tar.gz
+b941b8f4de297827f3211c2cb34af199  jakarta-regexp-1.5.tar.gz