diff --git a/README.md b/README.md
index f636e8c..e715033 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,7 @@
 A Python module for parsing, analyzing, and manipulating GEDCOM files.
 
 GEDCOM files contain ancestry data. The parser is currently supporting
-the GEDCOM 5.5 format which is detailed here: http://homepages.rootsweb.ancestry.com/~pmcbride/gedcom/55gctoc.htm
+the GEDCOM 5.5 format which is detailed [here](https://chronoplexsoftware.com/gedcomvalidator/gedcom/gedcom-5.5.pdf).
 
 > **NOTE**: This module is currently under development and **should not be used in production**!
 > The current development process can be tracked in the ["develop" branch](https://github.com/reynke/python-gedcom/tree/develop).
@@ -46,6 +46,10 @@ was licensed under the GPL v2 and then continued by
 
 ## Changelog
 
+**v0.2.1dev**
+
+- Changed broken links to GEDCOM format specification ([#2](https://github.com/nickreynke/python-gedcom/issues/2))
+
 **v0.2.0dev**
 
 - Added `develop` branch to track and update current development process
diff --git a/gedcom/__init__.py b/gedcom/__init__.py
index 9dd885e..f1d78d1 100644
--- a/gedcom/__init__.py
+++ b/gedcom/__init__.py
@@ -257,9 +257,8 @@ def __parse_line(line_number, line, last_element):
         regex_match = regex.match(gedcom_line_regex, line)
 
         if regex_match is None:
-            error_message = ("Line `%d` of document violates GEDCOM format" % line_number +
-                             "\nSee: http://homepages.rootsweb.ancestry.com/" +
-                             "~pmcbride/gedcom/55gctoc.htm")
+            error_message = ("Line `%d` of document violates GEDCOM format 5.5" % line_number +
+                             "\nSee: https://chronoplexsoftware.com/gedcomvalidator/gedcom/gedcom-5.5.pdf")
             raise SyntaxError(error_message)
 
         line_parts = regex_match.groups()
@@ -272,10 +271,9 @@ def __parse_line(line_number, line, last_element):
 
         # Check level: should never be more than one higher than previous line.
         if level > last_element.get_level() + 1:
-            error_message = ("Line %d of document violates GEDCOM format" % line_number +
-                             "\nLines must be no more than one level higher than " +
-                             "previous line.\nSee: http://homepages.rootsweb." +
-                             "ancestry.com/~pmcbride/gedcom/55gctoc.htm")
+            error_message = ("Line %d of document violates GEDCOM format 5.5" % line_number +
+                             "\nLines must be no more than one level higher than previous line." +
+                             "\nSee: https://chronoplexsoftware.com/gedcomvalidator/gedcom/gedcom-5.5.pdf")
             raise SyntaxError(error_message)
 
         # Create element. Store in list and dict, create children and parents.
diff --git a/setup.py b/setup.py
index 84fe3e9..d84dcd9 100644
--- a/setup.py
+++ b/setup.py
@@ -1,4 +1,4 @@
-from distutils.core import setup
+from setuptools import setup
 
 setup(
     name='python-gedcom',