diff --git a/ZODB-4.0.0.tar.gz b/ZODB-4.0.0.tar.gz
new file mode 100644
index 0000000..cbd1e9b
--- /dev/null
+++ b/ZODB-4.0.0.tar.gz
@@ -0,0 +1,3 @@
+version https://git-lfs.github.com/spec/v1
+oid sha256:f5874f434c171824d70f57b2b61bfe1526f97ea019e7f9743fd72370029b7075
+size 390414
diff --git a/ZODB-4.0.0b3.tar.gz b/ZODB-4.0.0b3.tar.gz
deleted file mode 100644
index 0146d89..0000000
--- a/ZODB-4.0.0b3.tar.gz
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:8eafbe3e851741c18925752d172c944f955ff566412eac6f20351d8801768e81
-size 398300
diff --git a/fix-for-upstream-test.patch b/fix-for-upstream-test.patch
new file mode 100644
index 0000000..7de91a5
--- /dev/null
+++ b/fix-for-upstream-test.patch
@@ -0,0 +1,25 @@
+diff --git a/src/ZODB/tests/testUtils.py b/src/ZODB/tests/testUtils.py
+index bc3d089..17803cc 100644
+--- a/src/ZODB/tests/testUtils.py
++++ b/src/ZODB/tests/testUtils.py
+@@ -20,7 +20,7 @@ from persistent import Persistent
+ 
+ from zope.testing import renormalizing
+ from ZODB.utils import U64, p64, u64
+-from ZODB._compat import loads, long
++from ZODB._compat import loads
+ 
+ 
+ NUM = 100
+@@ -35,9 +35,9 @@ checker = renormalizing.RENormalizing([
+ 
+ class TestUtils(unittest.TestCase):
+ 
+-    small = [random.randrange(1, 1<<32, int=long)
++    small = [random.randrange(1, 1<<32)
+              for i in range(NUM)]
+-    large = [random.randrange(1<<32, 1<<64, int=long)
++    large = [random.randrange(1<<32, 1<<64)
+              for i in range(NUM)]
+     all = small + large
+ 
diff --git a/python-ZODB.changes b/python-ZODB.changes
index 810e2a0..d471e02 100644
--- a/python-ZODB.changes
+++ b/python-ZODB.changes
@@ -1,3 +1,16 @@
+-------------------------------------------------------------------
+Sat Feb  1 21:17:50 UTC 2014 - os-dev@jacraig.com
+
+- Add patch to fix test during build.  This is fixed upstream for next release.
+- Update old package URL.
+- Update to 4.0.0 (minor changes from git commit log):
+  * Try invoking parent close() via super(), hoping to squash ResourceWarning.
+    Also, avoid shadowing the 'file' builtin / alias with locals.
+  * Bend over backward to avoid ResourceWarnings.
+  * Use os.pathsep when constructing $PYTHONPATH (fix test failure on Windows).
+  * Update to latest 2.2.0 bootstrap.py
+  * Correctly quote Windows pathnames
+
 -------------------------------------------------------------------
 Sat Aug  3 20:34:31 UTC 2013 - hpj@urpla.net
 
diff --git a/python-ZODB.spec b/python-ZODB.spec
index 160bbcf..00cd4fb 100644
--- a/python-ZODB.spec
+++ b/python-ZODB.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package python-ZODB
 #
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2014 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # Copyright (c) 2013 LISA GmbH, Bingen, Germany.
 #
 # All modifications and additions to the file contributed by third parties
@@ -18,30 +18,31 @@
 
 
 Name:           python-ZODB
-Version:        4.0.0b3
+Version:        4.0.0
 Release:        0
 Summary:        Zope Object Database: object database and persistence
 License:        ZPL-2.1
 Group:          Development/Libraries/Python
-Url:            http://www.zope.org/Products/ZODB
+Url:            http://www.zodb.org/
 Source:         https://pypi.python.org/packages/source/Z/ZODB/ZODB-%{version}.tar.gz
-BuildRequires:  python-setuptools
-BuildRequires:  python-persistent-devel
+# PATCH-FIX-UPSTREAM fix-for-upstream-test.patch -- already fixed in git 4.0.0b3-16-g1cdf9a7
+Patch1:         fix-for-upstream-test.patch
 BuildRequires:  python-BTrees
 BuildRequires:  python-ZConfig
-BuildRequires:  python-transaction
+BuildRequires:  python-persistent-devel
+BuildRequires:  python-setuptools
 BuildRequires:  python-six
+BuildRequires:  python-transaction
 BuildRequires:  python-zc.lockfile
 BuildRequires:  python-zdaemon >= 4.0.0
 BuildRequires:  python-zope.interface
-
+Requires:       python-BTrees
+Requires:       python-ZConfig
 Requires:       python-persistent
-Requires:	python-BTrees
-Requires:	python-ZConfig
-Requires:	python-transaction
-Requires:	python-six
-Requires:	python-zc.lockfile
-Requires:	python-zdaemon >= 4.0.0
+Requires:       python-six
+Requires:       python-transaction
+Requires:       python-zc.lockfile
+Requires:       python-zdaemon >= 4.0.0
 Requires:       python-zope.interface
 # Testing requirements:
 BuildRequires:  python-manuel
@@ -72,6 +73,7 @@ This package contains documentation files for %{name}.
 
 %prep
 %setup -q -n ZODB-%{version}
+%patch1 -p1
 
 %build
 python setup.py build