diff --git a/Doc/library/bsddb.rst b/Doc/library/bsddb.rst
index ed45619847d..52ff38a0404 100644
--- a/Doc/library/bsddb.rst
+++ b/Doc/library/bsddb.rst
@@ -6,6 +6,9 @@
    :synopsis: Interface to Berkeley DB database library
 .. sectionauthor:: Skip Montanaro <skip@pobox.com>
 
+.. deprecated:: 2.6
+    The :mod:`bsddb` module has been deprecated for removal in Python 3.0.
+
 
 The :mod:`bsddb` module provides an interface to the Berkeley DB library.  Users
 can create hash, btree or record based library files using the appropriate open
diff --git a/Doc/library/dbhash.rst b/Doc/library/dbhash.rst
index bedfad42672..6f9a24f52ca 100644
--- a/Doc/library/dbhash.rst
+++ b/Doc/library/dbhash.rst
@@ -5,10 +5,8 @@
    :synopsis: DBM-style interface to the BSD database library.
 .. sectionauthor:: Fred L. Drake, Jr. <fdrake@acm.org>
 
-.. note::
-   The :mod:`dbhash` module has been renamed to :mod:`dbm.bsd` in Python 3.0.
-   The :term:`2to3` tool will automatically adapt imports when converting your
-   sources to 3.0.
+.. deprecated:: 2.6
+    The :mod:`dbhash` module has been deprecated for removal in Python 3.0.
 
 .. index:: module: bsddb
 
diff --git a/Lib/bsddb/__init__.py b/Lib/bsddb/__init__.py
index 0e5169cbc4f..0af679f730f 100644
--- a/Lib/bsddb/__init__.py
+++ b/Lib/bsddb/__init__.py
@@ -42,6 +42,12 @@ instead.  It mirrors the Oracle Berkeley DB C API.
 import sys
 absolute_import = (sys.version_info[0] >= 3)
 
+if sys.py3kwarning:
+    import warnings
+    warnings.warnpy3k("in 3.x, bsddb has been removed; "
+                      "please use the pybsddb project instead",
+                      DeprecationWarning, 2)
+
 try:
     if __name__ == 'bsddb3':
         # import _pybsddb binary as it should be the more recent version from
diff --git a/Lib/dbhash.py b/Lib/dbhash.py
index 9f8a9c3f28b..5ca0bc1913a 100644
--- a/Lib/dbhash.py
+++ b/Lib/dbhash.py
@@ -1,6 +1,9 @@
 """Provide a (g)dbm-compatible interface to bsddb.hashopen."""
 
 import sys
+if sys.py3kwarning:
+    import warnings
+    warnings.warnpy3k("in 3.x, dbhash has been removed", DeprecationWarning, 2)
 try:
     import bsddb
 except ImportError:
diff --git a/Lib/test/test_py3kwarn.py b/Lib/test/test_py3kwarn.py
index 7bfe1e5be4e..780de740676 100644
--- a/Lib/test/test_py3kwarn.py
+++ b/Lib/test/test_py3kwarn.py
@@ -305,7 +305,7 @@ class TestStdlibRemovals(unittest.TestCase):
                            'sunos5' : ('sunaudiodev', 'SUNAUDIODEV'),
                           }
     optional_modules = ('bsddb185', 'Canvas', 'dl', 'linuxaudiodev', 'imageop',
-                        'sv', 'cPickle')
+                        'sv', 'cPickle', 'bsddb', 'dbhash')
 
     def check_removal(self, module_name, optional=False):
         """Make sure the specified module, when imported, raises a
diff --git a/Lib/test/test_warnings.py b/Lib/test/test_warnings.py
index 1520bf2b350..9980f2497d6 100644
--- a/Lib/test/test_warnings.py
+++ b/Lib/test/test_warnings.py
@@ -508,6 +508,7 @@ class CatchWarningTests(BaseTest):
         wmod = self.module
         with wmod.catch_warnings(module=wmod, record=True) as w:
             self.assertEqual(w, [])
+            self.assertRaises(AttributeError, getattr, w, 'message')
             wmod.simplefilter("always")
             wmod.warn("foo")
             self.assertEqual(str(w.message), "foo")
diff --git a/Lib/warnings.py b/Lib/warnings.py
index b699c439cf7..9ec04be274b 100644
--- a/Lib/warnings.py
+++ b/Lib/warnings.py
@@ -314,7 +314,14 @@ class WarningsRecorder(list):
         self.append(WarningMessage(*args, **kwargs))
 
     def __getattr__(self, attr):
-        return getattr(self[-1], attr)
+        """Return attributes from the last caught warning, or raise
+        AttributeError."""
+        try:
+            return getattr(self[-1], attr)
+        except IndexError:
+            raise AttributeError("no recorded warning to read "
+                                    "{0!r} attribute from".format(attr))
+
 
     def reset(self):
         del self[:]
diff --git a/Misc/NEWS b/Misc/NEWS
index dd703ee3a13..8c246538a82 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -56,6 +56,8 @@ C-API
 Library
 -------
 
+- Issue 3776: Deprecate the bsddb package for removal in 3.0.
+
 - Issue #3762: platform.architecture() fails if python is lanched via
   its symbolic link.