diff --git a/c2rst.py b/c2rst.py
deleted file mode 100644
index 7f9e8d23db..0000000000
--- a/c2rst.py
+++ /dev/null
@@ -1,17 +0,0 @@
-import docutils.parsers
-import docutils.parsers.rst as rst
-
-class CStrip(docutils.parsers.Parser):
-  def __init__(self):
-    self.rst_parser = rst.Parser()
-
-  def parse(self, inputstring, document):
-    stripped = []
-    for line in inputstring.split("\n"):
-      line = line.strip()
-      if line == "//|":
-        stripped.append("")
-      elif line.startswith("//| "):
-        stripped.append(line[len("//| "):])
-    stripped = "\r\n".join(stripped)
-    self.rst_parser.parse(stripped, document)
diff --git a/conf.py b/conf.py
index 8264a9166d..df0ea0a1c4 100644
--- a/conf.py
+++ b/conf.py
@@ -21,6 +21,7 @@ from recommonmark.parser import CommonMarkParser
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
+sys.path.insert(0, os.path.abspath('docs'))
 sys.path.insert(0, os.path.abspath('.'))
 
 master_doc = 'docs/index'
diff --git a/docs/c2rst.py b/docs/c2rst.py
index 3018e62aff..9ca8bc1bb3 100644
--- a/docs/c2rst.py
+++ b/docs/c2rst.py
@@ -1,10 +1,18 @@
 import sphinx.parsers
-import docutils.parsers.rst as rst
 
 class CStrip(sphinx.parsers.Parser):
-  def __init(self):
-    self.rst_parser = rst.Parser()
+    def __init__(self):
+        self.rst_parser = sphinx.parsers.RSTParser()
 
-  def parse(self, inputstring, document):
-    print(inputstring)
-    self.rst_parser(stripped, document)
+    def parse(self, inputstring, document):
+        # This setting is missing starting with Sphinx 1.7.1 so we set it ourself.
+        document.settings.tab_width = 4
+        stripped = []
+        for line in inputstring.split("\n"):
+            line = line.strip()
+            if line == "//|":
+                stripped.append("")
+            elif line.startswith("//| "):
+                stripped.append(line[len("//| "):])
+        stripped = "\r\n".join(stripped)
+        self.rst_parser.parse(stripped, document)