diff --git a/.cvsignore b/.cvsignore
index 9fcf10d..b7a3182 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-zope.interface-3.5.2.tar.gz
+zope.interface-3.6.1.tar.gz
diff --git a/ZPL-2.1.txt b/ZPL-2.1.txt
deleted file mode 100644
index b2c938c..0000000
--- a/ZPL-2.1.txt
+++ /dev/null
@@ -1,40 +0,0 @@
-Zope Public License (ZPL) Version 2.1
-
-A copyright notice accompanies this license document that identifies the
-copyright holders.
-
-This license has been certified as open source. It has also been designated
-as GPL compatible by the Free Software Foundation (FSF).
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-   1. Redistributions in source code must retain the accompanying copyright
-      notice, this list of conditions, and the following disclaimer.
-   2. Redistributions in binary form must reproduce the accompanying copyright
-      notice, this list of conditions, and the following disclaimer in the
-      documentation and/or other materials provided with the distribution.
-   3. Names of the copyright holders must not be used to endorse or promote
-      products derived from this software without prior written permission from
-      the copyright holders.
-   4. The right to distribute this software or to use it for any purpose does
-      not give you the right to use Servicemarks (sm) or Trademarks (tm) of the
-      copyright holders. Use of them is covered by separate agreement with the
-      copyright holders.
-   5. If any files are modified, you must cause the modified files to carry
-      prominent notices stating that you changed the files and the date of any
-      change.
-
-Disclaimer
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS ``AS IS'' AND ANY EXPRESSED
-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 HOLDERS 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.
-
diff --git a/python-zope-interface.spec b/python-zope-interface.spec
index c58ab2e..bb2fef2 100644
--- a/python-zope-interface.spec
+++ b/python-zope-interface.spec
@@ -1,14 +1,13 @@
 %{!?python_sitearch: %define python_sitearch %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)")}
 
 Name:		python-zope-interface
-Version:	3.5.2
-Release:	2%{?dist}
+Version:	3.6.1
+Release:	1%{?dist}
 Summary:	Zope 3 Interface Infrastructure
 Group:		Development/Libraries
 License:	ZPLv2.1
 URL:		http://pypi.python.org/pypi/zope.interface
 Source0:	http://pypi.python.org/packages/source/z/zope.interface/zope.interface-%{version}.tar.gz
-Source1:	ZPL-2.1.txt
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	python-devel
 # zope.interface 3.5.0 won't build the C extension if distutils are used
@@ -23,11 +22,6 @@ This is a separate distribution of the zope.interface package used in Zope 3.
 
 %prep
 %setup -n zope.interface-%{version} -q
-%{__cp} -a %{SOURCE1} .
-
-# Tests require additional modules and shouldn't be packaged
-%{__rm} -rfv src/zope/interface/tests/
-%{__rm} -rfv src/zope/interface/common/tests/
 
 %build
 CFLAGS="%{optflags}" %{__python} setup.py build
@@ -53,11 +47,16 @@ CFLAGS="%{optflags}" %{__python} setup.py build
 
 %files
 %defattr(-,root,root,-)
-%doc ZPL-2.1.txt src/zope/interface/*.txt
+%doc CHANGES.txt COPYRIGHT.txt LICENSE.txt src/zope/interface/*.txt
 %{python_sitearch}/zope/*
 %{python_sitearch}/zope.interface*
 
 %changelog
+* Tue Jun 22 2010 Robin Lee <robinlee.sysu@gmail.com> - 3.6.1-1
+- update to 3.6.1
+- License provided in the source package
+- include the tests
+
 * Sun Jul 26 2009 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 3.5.2-2
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_12_Mass_Rebuild
 
diff --git a/sources b/sources
index 8dd669f..8e0f234 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-7f650e26385a452a6e1148797aa11dfd  zope.interface-3.5.2.tar.gz
+7a895181b8d10be4a7e9a3afa13cd3be  zope.interface-3.6.1.tar.gz