diff --git a/README.rst b/README.rst
index ef1e1bc3e7a126e57e2fa7c0b3d6af58efca0488..ea87a0dbfd46ea348e5e860f933d042f6d789f1e 100644
--- a/README.rst
+++ b/README.rst
@@ -60,14 +60,22 @@ as ``chkcrontab``. The project page is on `pypi`_:
 
 The source code is available in the following locations:
 
-* Bitbucket: https://bitbucket.org/lyda/chkcrontab/
-* code.google: https://code.google.com/p/chkcrontab/
+* Gitlab: https://gitlab.com/lyda/chkcrontab
 * Github: https://github.com/lyda/chkcrontab
-* Gitorious: https://gitorious.org/uu/chkcrontab
+* Bitbucket: https://bitbucket.org/lyda/chkcrontab/
 * Sourceforge: https://sourceforge.net/p/chkcrontab
 
 Pull requests on any of those platforms or emailed patches are fine.
-Opening issues on github is easiest, but I'll check any of them.
+Opening issues on gitlab or github is easiest, but I'll check any
+of them.
+
+Packaging
+=========
+
+For rpm distributions, ``./setup.py bdist --formats=rpm`` should make an
+rpm but currently dies due to not finding the chkcrontab.1 man page.
+
+For Debian distributions there's an additional tool that might work.
 
 TODO
 ====
@@ -76,8 +84,11 @@ TODO
 * Check for backticks. (why?)
 * Make sure MAILTO and PATH are set (perhaps others?).
 * Add tests for command line.
-* Enable it to parse user crontabs: https://code.google.com/p/chkcrontab/issues/detail?id=2
-* Make "acceptable filenames" a configurable thing: https://github.com/lyda/chkcrontab/issues/4
+* Enable it to parse user crontabs: 
+  https://github.com/lyda/chkcrontab/issues/12
+* Make "acceptable filenames" a configurable thing:
+  https://github.com/lyda/chkcrontab/issues/4
+* Packaging: https://github.com/lyda/chkcrontab/issues/13
 
 Credits
 =======
diff --git a/setup.py b/setup.py
index 0d5b0101ef185a0c54f59ca2ed483536ac0dff53..58cade7789caa00aab138e63808911c9a549f28a 100755
--- a/setup.py
+++ b/setup.py
@@ -29,7 +29,7 @@ from distutils.core import Command
 
 BASE_DIR = os.path.dirname(globals().get('__file__', os.getcwd()))
 VERSION = subprocess.check_output(
-    ['git', 'describe', '--dirty=*', '--always']).strip().decode('utf8')
+    ['git', 'describe', '--dirty', '--always']).strip().decode('utf8')
 open('_version.py', 'w').write('__version__ = "%s"\n' % VERSION)
 
 class TestCmd(Command):
@@ -43,13 +43,8 @@ class TestCmd(Command):
     pass
 
   def run(self):
-    if sys.version_info < (2, 7):
-        try:
-            import unittest2 as unittest
-        except ImportError:
-            raise RuntimeError('unittest2 required for running tests under Python < 2.7.')
-    else:
-        import unittest
+    # Testing only works on python 2.7 and up.
+    import unittest
 
     test_dir = os.path.join(BASE_DIR, 'tests')
 
@@ -174,9 +169,9 @@ setup(
   cmdclass=cmdclass,
   name='chkcrontab',
   version=VERSION,
-  url='http://code.google.com/p/chkcrontab',
+  url='https://gitlab.com/lyda/chkcrontab',
   author='Kevin Lyda',
-  author_email='lyda@google.com',
+  author_email='kevin@phrye.com',
   description='A tool to detect crontab errors',
   long_description=open('README.rst').read(),
   py_modules=['chkcrontab_lib', '_version'],