diff --git a/.cvsignore b/.cvsignore
index d588f7d..069b3f1 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-jd-2.1.0-svn2575_trunk.tgz
+jd-2.1.0-svn2580_trunk.tgz
diff --git a/jd.spec b/jd.spec
index 04d5f18..98f4bde 100644
--- a/jd.spec
+++ b/jd.spec
@@ -10,7 +10,7 @@
 # Defined by upsteam
 #
 %define         main_ver      2.1.0
-%define         strtag        svn2575_trunk
+%define         strtag        svn2580_trunk
 %define         repoid        36586
 # Define this if this is pre-version
 %define         pre_release   1
@@ -20,7 +20,7 @@
 # Defined by vendor
 #
 %define         vendor_rel    2
-%define         extra_rel     .onig
+%define         extra_rel     %{nil}
 # Tag name changed from vendor to vendorname so as not to
 # overwrite Vendor entry in Summary
 %define         vendorname    fedora
@@ -54,9 +54,6 @@ URL:            http://jd4linux.sourceforge.jp/
 Source0:        http://downloads.sourceforge.jp/jd4linux/%{repoid}/%{name}-%{main_ver}-%{strtag}.tgz
 #Patch0:		jd-svn2573-compile.patch
 #Source0:	%{name}-%{main_ver}-%{strtag}.tgz
-# From JD development thread:
-# Modified for migemo
-Patch10:        jd-rev2575-oniguruma.patch
 BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildRequires:  %{gtkmmdevel}
@@ -68,7 +65,9 @@ BuildRequires:  libSM-devel
 BuildRequires:  cmigemo-devel
 %endif
 BuildRequires:  alsa-lib-devel
+%if 0%{?fedora} > 8
 BuildRequires:  oniguruma-devel
+%endif
 %if %{pre_release}
 BuildRequires:	subversion
 %endif
@@ -80,19 +79,19 @@ JD is a 2ch browser based on gtkmm2.
 
 %prep
 %setup -q -n %{name}-%{main_ver}-%{strtag}
-#%%patch0 -p0 -b .compile
-%patch10 -p0 -b .onig
 #find . -name .svn | sort -r | xargs %{__rm} -rf
 
-%build
 sh autogen.sh
 
+%build
 # set TZ for __TIME__
 export TZ='Asia/Tokyo'
 
 %configure \
    --with-alsa \
+%if 0%{?fedora} > 8
    --with-oniguruma \
+%endif
    --with-xdgopen \
 %if 0%{?_with_migemo} >= 1
    --with-migemo \
@@ -135,8 +134,12 @@ touch --no-create %{_datadir}/icons/hicolor || :
 %{icondir}/%{name}.png
 
 %changelog
-* Fri Dec 19 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
-- rev 2575
+* Sat Dec 20 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- rev 2580
+
+* Sat Dec 20 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp>
+- rev 2579
+- Use oniguruma on F-9+ for regex
 
 * Tue Dec 16 2008 Mamoru Tasaka <mtasaka@ioa.s.u-tokyo.ac.jp> - 2.0.3-0.2.beta081216
 - 2.0.3 beta 081216
diff --git a/sources b/sources
index 33f16af..68c0a6d 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-483decf90d4f7f362fae05e0f55ff7e2  jd-2.1.0-svn2575_trunk.tgz
+45fc15b5579733b8985879abcf2d4e91  jd-2.1.0-svn2580_trunk.tgz