diff --git a/.cvsignore b/.cvsignore
index ca213d5..2d1895f 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-nltk-0.9.2.tar.gz
+nltk-0.9.9.tar.gz
diff --git a/nltk-0.9.2-use-sys-yaml.patch b/nltk-0.9.2-use-sys-yaml.patch
deleted file mode 100644
index 094f194..0000000
--- a/nltk-0.9.2-use-sys-yaml.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- nltk-0.9.2/setup.py.use-sys-yaml	2008-02-28 16:49:21.000000000 -0500
-+++ nltk-0.9.2/setup.py	2008-04-07 02:13:45.000000000 -0400
-@@ -64,6 +64,5 @@
-                 'nltk_contrib.rte',
-                 'nltk_contrib.toolbox',
-                 'nltk_contrib.wordnet',
--                'yaml'
-                 ],
-     )
diff --git a/nltk-0.9.9-use-sys-yaml.patch b/nltk-0.9.9-use-sys-yaml.patch
new file mode 100644
index 0000000..2caedb1
--- /dev/null
+++ b/nltk-0.9.9-use-sys-yaml.patch
@@ -0,0 +1,9 @@
+--- nltk-0.9.9/setup.py.use-sys-yaml	2009-05-03 18:39:10.000000000 +0800
++++ nltk-0.9.9/setup.py	2010-05-10 14:54:35.745349487 +0800
+@@ -89,6 +89,5 @@
+                 'nltk_contrib.tiger.utils',
+                 'nltk_contrib.toolbox',
+                 'nltk_contrib.wordnet',
+-                'yaml'
+                 ],
+     )
diff --git a/python-nltk.spec b/python-nltk.spec
index 07f3eb0..1bc7c6d 100644
--- a/python-nltk.spec
+++ b/python-nltk.spec
@@ -1,24 +1,23 @@
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib()")}
+%if ! (0%{?fedora} > 12 || 0%{?rhel} > 5)
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
 
 # define prerel
 Name:           python-nltk
 Epoch:          1
-Version:        0.9.2
-Release:        3%{?dist}
+Version:        0.9.9
+Release:        1%{?dist}
 Summary:        Natural Language Toolkit
 
 Group:          Development/Libraries
 License:        GPLv2
-URL:            http://nltk.sf.net/
-Source0:        http://osdn.dl.sourceforge.net/sourceforge/nltk/nltk-%{version}%{?prerel}.tar.gz
-Patch0:         nltk-0.9.2-use-sys-yaml.patch
+URL:            http://www.nltk.org/
+Source0:        http://nltk.googlecode.com/files/nltk-%{version}%{?prerel}.tar.gz
+Patch0:         nltk-0.9.9-use-sys-yaml.patch
 BuildRoot:      %(mktemp -ud %{_tmppath}/%{name}-%{version}-%{release}-XXXXXX)
 BuildArch:      noarch
 
-Obsoletes:      python-nltk_lite <= 0.6.6-2%{?dist}
-Provides:       python-nltk_lite = %{version}-%{release}
-
-BuildRequires:  python-devel tkinter
+BuildRequires:  python2-devel tkinter
 Requires:       numpy python-matplotlib tkinter PyYAML
 
 %description
@@ -41,22 +40,23 @@ research projects.
 
 %install
 rm -rf $RPM_BUILD_ROOT
-sed -ie 's|\xD1|-|g' README.txt
 %{__python} setup.py install --skip-build --root $RPM_BUILD_ROOT
 
-# Make scripts executable
+# Remove shebangs, which has been all removed in upstream development branch
 pushd $RPM_BUILD_ROOT%{python_sitelib}
 pushd nltk
-chmod +x stem/{porter,rslp}.py misc/nemo.py corpus/reader/toolbox.py
-chmod +x test/{coverage,doctest_driver}.py
+sed -i -e '/^#!\//, 1d' downloader.py corpus/reader/toolbox.py \
+    stem/{porter,rslp}.py test/{coverage,doctest_driver}.py \
+    toolbox/{__init__,toolbox}.py app/{wxwordnet_app,nemo_app}.py
 popd
 pushd nltk_contrib
-chmod +x bioreader/bioreader.py
-chmod +x readability/{crawler,languageclassifier,syllables_no,textanalyzer,urlextracter}.py 
-chmod +x toolbox/{data,iu_mien_hier,language,normalise,settings}.py
+sed -i -e '/^#!\//, 1d' bioreader/bioreader.py \
+    readability/{crawler,languageclassifier,textanalyzer,urlextracter,syllables_no}.py \
+    toolbox/{data,normalise,etreelib,settings,iu_mien_hier,language}.py \
+    lambek/{lambek,term,lexicon,typedterm}.py mit/six863/tagging/tagparse.py
 # Fix EOL
 sed -i 's|\r$||g' \
-    readability/{syllables_no,textanalyzer}.py
+    readability/{syllables_{en,no},textanalyzer}.py
 popd
 popd
 
@@ -70,12 +70,19 @@ rm -rf $RPM_BUILD_ROOT
 %doc LICENSE.txt README.txt
 %{python_sitelib}/nltk
 %{python_sitelib}/nltk_contrib
-%if 0%{?fedora} >= 9
 %{python_sitelib}/nltk-*.egg-info
-%endif
 
 
 %changelog
+* Mon May 17 2010 Robin Lee <robinlee.sysu@gmail.com> - 1:0.9.9-1
+- Update to 0.9.9 (#527148,#545521)
+- Remove specifications for obsolete Fedora versions
+- URL and Source0 URL revised
+- Remove shebangs instead of making files executable
+
+* Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.9.2-4
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
+
 * Thu Feb 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1:0.9.2-3
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_11_Mass_Rebuild
 
diff --git a/sources b/sources
index c604bb8..6227a68 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-f48ae60bac4175f8af67d0f19d4d226c  nltk-0.9.2.tar.gz
+648e25648f66e7e52db28983f39da50f  nltk-0.9.9.tar.gz