diff --git a/MANIFEST b/MANIFEST
index 18cf95c..5087e97 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -1,7 +1,7 @@
 MANIFEST
 ChangeLog
 Example
-README
+README.md
 COPYING
 setup.py
 setup.cfg
diff --git a/README b/README
deleted file mode 100644
index 80d4101..0000000
--- a/README
+++ /dev/null
@@ -1,68 +0,0 @@
-python-cdb 0.35
-Alan Grow <alangrow+python-cdb@gmail.com>
-15 Feb 2013
-
-INTRO
-=====
-The python-cdb extension module is an adaptation of D. J. Bernstein's
-constant database package (see http://cr.yp.to/cdb.html).
-
-cdb files are mappings of keys to values, designed for wickedly
-fast lookups and atomic updates.  This module mimics the normal
-cdb utilities, cdb(get|dump|make), via convenient, high-level Python
-objects.
-
-
-COPYRIGHT
-=========
-python-cdb is free software, as is cdb itself.
-
-The extension module is licensed under the GNU GPL version 2 or later,
-and is copyright 2001, 2002 Michael J. Pomraning.  Ancillary files from
-Felix von Leitner's libowfat are also licensed under the GPL.  Finally,
-modifications to D. J. Bernstein's public domain cdb implementation are
-similarly released to the public domain.
-
-
-INSTALL
-=======
-
-  $ tar zxf python-cdb-$VERSION.tgz
-  $ cd python-cdb-$VERSION
-  $ python setup.py build
-  $ python setup.py install
-  # python setup.py bdist --format=rpm, if you prefer
-
-Now break it and tell me about it (or use it smoothly and tell me
-about that, too).
-
-DOCS
-====
-Consult the docstrings for module, class, and function documentation.
-
-  $ python -c 'import cdb; print cdb.__doc__'
-  $ python -c 'import cdb; print cdb.cdbmake("f.cdb","f.tmp").__doc__'
-  $ python -c 'import cdb; print cdb.init("some.cdb").__doc__'
-
-BUGS
-====
-Bug reports to Alan Grow <alangrow+python-cdb@gmail.com>.
-
-
-TODO
-====
-
-  - more dict-like API
-
-  - test cases
-
-  - take advantage of contemporary Python API 
-
-  - formal speed benchmarks
-
-  - possibly revert to DJB's cdb implementation
-    explicitly public domain since 2007Q4
-
-  - better README/docs
-
-  - mingw support
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..c2dcf91
--- /dev/null
+++ b/README.md
@@ -0,0 +1,59 @@
+## INTRO
+
+The `python-cdb` extension module is an adaptation of D. J. Bernstein's [constant database package](http://cr.yp.to/cdb.html).
+
+`cdb` files are mappings of keys to values, designed for wickedly fast lookups and atomic updates.  This module mimics the normal `cdb` utilities, `cdb(get|dump|make)`, via convenient, high-level Python objects.
+
+
+## INSTALL
+
+```sh
+tar zxf python-cdb-$VERSION.tgz
+cd python-cdb-$VERSION
+python setup.py build
+python setup.py install
+# python setup.py bdist --format=rpm, if you prefer
+```
+
+Now break it and tell me about it (or use it smoothly and tell me about that, too).
+
+
+## DOCS
+
+Consult the docstrings for module, class, and function documentation.
+
+```sh
+python -c 'import cdb; print cdb.__doc__'
+python -c 'import cdb; print cdb.cdbmake("f.cdb","f.tmp").__doc__'
+python -c 'import cdb; print cdb.init("some.cdb").__doc__'
+```
+
+
+## BUGS
+
+Please report new bugs via the [Github issue tracker](https://github.com/acg/python-cdb/issues).
+
+
+## TODO
+
+- [ ] more dict-like API
+- [ ] test cases
+- [ ] take advantage of contemporary Python API
+- [ ] formal speed benchmarks
+- [ ] possibly revert to DJB's cdb implementation; explicitly public domain since 2007Q4
+- [ ] better README/docs
+- [ ] mingw support
+
+
+## COPYRIGHT
+
+`python-cdb` is free software, as is cdb itself.
+
+The extension module is licensed under the GNU GPL version 2 or later, and is copyright 2001, 2002 Michael J. Pomraning.  Ancillary files from Felix von Leitner's libowfat are also licensed under the GPL.  Finally, modifications to D. J. Bernstein's public domain cdb implementation are similarly released to the public domain.
+
+
+## AUTHORS
+
+- Alan Grow <alangrow+python-cdb@gmail.com>
+- Mike Pomraning <mjp@pilcrow.madison.wi.us>
+
diff --git a/setup.cfg b/setup.cfg
index 5f9c528..31cfd86 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -3,6 +3,6 @@
 [bdist_rpm]
 release = 1
 doc_files = ChangeLog
-            README
+            README.md
             COPYING
             Example
diff --git a/setup.py b/setup.py
index 27c113f..5b3320d 100644
--- a/setup.py
+++ b/setup.py
@@ -23,12 +23,15 @@
 cdb utilities, cdb(get|dump|make), via convenient, high-level Python
 objects.''',
         ext_modules = [ Extension(
-                            "cdbmodule",
+                            "cdb",
                             SRCFILES,
                             include_dirs=[ SRCDIR + '/' ],
                             extra_compile_args=['-fPIC'],
                         )
                       ],
         url = "https://github.com/acg/python-cdb",
+        classifiers=[
+            'Programming Language :: Python',
+            'Programming Language :: Python :: 2',
+        ],
       )
-