diff --git a/CHANGES.txt b/CHANGES.txt
index 2ec6128..5d2956b 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,6 +1,15 @@
 CHANGES
 =======
 
+0.8.2 (unreleased)
+------------------
+
+- Using Python's ``doctest`` module instead of deprecated
+  ``zope.testing.doctest``.
+
+- Removed deprecated slugs for ZPKG and ZCML.
+
+
 0.8.1 (2010-05-25)
 ------------------
 
diff --git a/src/zc/table/SETUP.cfg b/src/zc/table/SETUP.cfg
deleted file mode 100644
index f06bc13..0000000
--- a/src/zc/table/SETUP.cfg
+++ /dev/null
@@ -1,3 +0,0 @@
-<data-files zopeskel/etc/package-includes>
-  zc.table-*.zcml
-</data-files>
diff --git a/src/zc/table/column.txt b/src/zc/table/column.txt
index 2405f2a..5b73eb0 100644
--- a/src/zc/table/column.txt
+++ b/src/zc/table/column.txt
@@ -65,7 +65,7 @@ email addresses.
     ...         ),
     ...     )
 
-Now, with this, we can create a table with input widgets.  The columns don't 
+Now, with this, we can create a table with input widgets.  The columns don't
 need a context other than the items themselves, so we ignore that part of the
 table formatter instantiation:
 
@@ -339,7 +339,7 @@ a bit table:
     >>> request.form["test.MA==.1"] = "on"
 
     >>> input = columns[1].input(data, request)
-    >>> from zope.testing.doctestunit import pprint
+    >>> from pprint import pprint
     >>> pprint(input)
     {'MA==': True,
      'Mw==': False}
diff --git a/src/zc/table/fieldcolumn.txt b/src/zc/table/fieldcolumn.txt
index c631d7f..63d3f92 100644
--- a/src/zc/table/fieldcolumn.txt
+++ b/src/zc/table/fieldcolumn.txt
@@ -55,7 +55,7 @@ with names and email addresses:
     ...     email = schema.TextLine(
     ...             title=u'Email Address',
     ...             constraint=re.compile('\w+@\w+([.]\w+)+$').match)
-    ...     salutation = schema.Choice( 
+    ...     salutation = schema.Choice(
     ...		       title=u'Salutation',
     ...		       values = ['Mr','Ms'],
     ...		       )
@@ -92,7 +92,7 @@ email addresses.
     ...	           BindingContactColumn(IContact["salutation"])
     ...            )
 
-Now, with this, we can create a table with input widgets.  The columns don't 
+Now, with this, we can create a table with input widgets.  The columns don't
 need a context other than the items themselves, so we ignore that part of the
 table formatter instantiation:
 
@@ -475,7 +475,7 @@ a bit table:
     >>> request.form["test.0.1"] = "on"
 
     >>> input = columns[1].input(data, formatter)
-    >>> from zope.testing.doctestunit import pprint
+    >>> from pprint import pprint
     >>> pprint(input)
     {'0': True,
      '3': False}
diff --git a/src/zc/table/tests.py b/src/zc/table/tests.py
index 19a9588..2400b5b 100644
--- a/src/zc/table/tests.py
+++ b/src/zc/table/tests.py
@@ -66,7 +66,7 @@ def fieldColumnSetUp(test):
 
 
 def test_suite():
-    from zope.testing import doctest
+    import doctest
     return unittest.TestSuite((
         doctest.DocFileSuite('README.txt',
             optionflags=doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS,
@@ -82,6 +82,3 @@ def test_suite():
             optionflags=doctest.NORMALIZE_WHITESPACE+doctest.ELLIPSIS,
             ),
         ))
-
-if __name__ == '__main__':
-    unittest.main(defaultTest='test_suite')
diff --git a/src/zc/table/zc.table-configure.zcml b/src/zc/table/zc.table-configure.zcml
deleted file mode 100644
index cd04d95..0000000
--- a/src/zc/table/zc.table-configure.zcml
+++ /dev/null
@@ -1 +0,0 @@
-<include package="zc.table"/>
\ No newline at end of file