diff --git a/.gitignore b/.gitignore
index 0d20b64..cec05fb 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,4 @@
 *.pyc
+build/
+dist/
+zippydoc.egg-info/
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..c011d97
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+include src/zippydoc/data/*
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..920e824
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+
+"""
+distutils/setuptools install script. See inline comments for packaging documentation.
+"""
+
+import os
+import sys
+
+try:
+  from setuptools import setup
+  # hush pyflakes
+  setup
+except ImportError:
+  from distutils.core import setup
+
+try:
+  from distutils.command.build_py import build_py_2to3 as build_py
+except ImportError:
+  from distutils.command.build_py import build_py
+
+packages = ['zippydoc']
+
+package_dir = {"zippydoc": "src/zippydoc"}
+
+package_data = {"zippydoc": ["data/template.html"]}
+
+scripts = [
+  'zpy2html'
+]
+
+print repr(package_data)
+
+setup(
+  name='zippydoc',
+  version='1.0',
+  maintainer='Sven Slootweg',
+  maintainer_email='admin@cryto.net',
+  description='Documentation markup language and library, including HTML converter.',
+  url='http://www.cryto.net/zippydoc',
+  packages=packages,
+  package_dir=package_dir,
+  package_data=package_data,
+  include_package_data=True,
+  scripts=scripts,
+  install_requires=['argparse'],
+  cmdclass={'build_py': build_py}
+)
+
diff --git a/documentation.html b/site/documentation.html
similarity index 100%
rename from documentation.html
rename to site/documentation.html
diff --git a/documentation.zpy b/site/documentation.zpy
similarity index 100%
rename from documentation.zpy
rename to site/documentation.zpy
diff --git a/example.html b/site/example.html
similarity index 100%
rename from example.html
rename to site/example.html
diff --git a/example.zpy b/site/example.zpy
similarity index 100%
rename from example.zpy
rename to site/example.zpy
diff --git a/index.html b/site/index.html
similarity index 85%
rename from index.html
rename to site/index.html
index 0a970d8..c21e05a 100644
--- a/index.html
+++ b/site/index.html
@@ -172,6 +172,6 @@
 
 		$ my_function("ZippyDoc", "awesome")
 
-		&gt; "ZippyDoc is awesome!"</pre><h7>Result:</h7><div class="definition"><a name="my_functionargument1argument2">my_function(argument1, argument2) <div class="children"><div class="exclamation"><strong>Important:</strong> This is just an example! <div class="children"></div></div><div class="text">This is a function.</div><dl><dt>argument1</dt><dd>This is the first argument.<div class="children"></div></dd></dl><dl><dt>argument2</dt><dd>This is the second argument.<div class="children"></div></dd></dl><div class="example">Example: How to call my_function <div class="children"><h7>Code:</h7><pre class="code">my_function("ZippyDoc", "awesome")</pre><h7>Output:</h7><pre class="output">"ZippyDoc is awesome!"</pre></div></div></div></a></div><h2>Documentation</h2><div class="text">The documentation for ZippyDoc can be found <a href="documentation.html">here</a>.</div><h2>Downloading ZippyDoc</h2><div class="text">ZippyDoc is still in a pretty messy stage, but it should already work reliably according to the current documentation. GitHub repository is coming soon, until that time you can <a href="zpy2html.py">download the conversion script here</a>. It's a Python script, so you'll need a Python interpreter of some sort. No dependencies are necessary, it only uses standard library functionality. Simply run it with all files you wish to convert as arguments, and it will convert each of them into a file with the same name, but a <em>.html</em> extension instead of the original extension. It's strongly recommended to name your ZippyDoc source files with the <em>.zpy</em> extension.</div></div>
+		&gt; "ZippyDoc is awesome!"</pre><h7>Result:</h7><div class="definition"><a name="my_functionargument1argument2">my_function(argument1, argument2) <div class="children"><div class="exclamation"><strong>Important:</strong> This is just an example! <div class="children"></div></div><div class="text">This is a function.</div><dl><dt>argument1</dt><dd>This is the first argument.<div class="children"></div></dd></dl><dl><dt>argument2</dt><dd>This is the second argument.<div class="children"></div></dd></dl><div class="example">Example: How to call my_function <div class="children"><h7>Code:</h7><pre class="code">my_function("ZippyDoc", "awesome")</pre><h7>Output:</h7><pre class="output">"ZippyDoc is awesome!"</pre></div></div></div></a></div><h2>Documentation</h2><div class="text">The documentation for ZippyDoc can be found <a href="documentation.html">here</a>.</div><h2>Downloading ZippyDoc</h2><div class="text">ZippyDoc is now a PyPi package! To install it, make sure you have pip installed, and run <span class="fixed">pip install zippydoc</span>. You can then use the <span class="fixed">zpy2html</span> command anywhere, to convert your ZippyDoc source files to HTML. The GitHub repository can be found <a href="https://github.com/joepie91/ZippyDoc">here</a>.</div></div>
 	</body>
 </html>
diff --git a/index.zpy b/site/index.zpy
similarity index 70%
rename from index.zpy
rename to site/index.zpy
index 436d40e..dfe11c8 100644
--- a/index.zpy
+++ b/site/index.zpy
@@ -56,7 +56,5 @@ The documentation for ZippyDoc can be found {>documentation}(here).
 
 ## Downloading ZippyDoc
 
-ZippyDoc is still in a pretty messy stage, but it should already work reliably according to the current documentation. GitHub repository is coming soon, until that time you can
-{<zpy2html.py}(download the conversion script here). It's a Python script, so you'll need a Python interpreter of some sort. No dependencies are necessary, it only uses standard
-library functionality. Simply run it with all files you wish to convert as arguments, and it will convert each of them into a file with the same name, but a **.html** extension
-instead of the original extension. It's strongly recommended to name your ZippyDoc source files with the **.zpy** extension.
+ZippyDoc is now a PyPi package! To install it, make sure you have pip installed, and run `pip install zippydoc`. You can then use the `zpy2html` command
+anywhere, to convert your ZippyDoc source files to HTML. The GitHub repository can be found {https://github.com/joepie91/ZippyDoc}(here).
diff --git a/zippydoc/__init__.py b/src/zippydoc/__init__.py
similarity index 100%
rename from zippydoc/__init__.py
rename to src/zippydoc/__init__.py
diff --git a/zippydoc/block_markup.py b/src/zippydoc/block_markup.py
similarity index 100%
rename from zippydoc/block_markup.py
rename to src/zippydoc/block_markup.py
diff --git a/template.html b/src/zippydoc/data/template.html
similarity index 100%
rename from template.html
rename to src/zippydoc/data/template.html
diff --git a/zippydoc/document.py b/src/zippydoc/document.py
similarity index 100%
rename from zippydoc/document.py
rename to src/zippydoc/document.py
diff --git a/zippydoc/transformation_ruleset.py b/src/zippydoc/transformation_ruleset.py
similarity index 100%
rename from zippydoc/transformation_ruleset.py
rename to src/zippydoc/transformation_ruleset.py
diff --git a/zippydoc/value.py b/src/zippydoc/value.py
similarity index 100%
rename from zippydoc/value.py
rename to src/zippydoc/value.py
diff --git a/zpy2html.py b/zpy2html
old mode 100644
new mode 100755
similarity index 94%
rename from zpy2html.py
rename to zpy2html
index 8e8c292..13a4fc0
--- a/zpy2html.py
+++ b/zpy2html
@@ -1,6 +1,15 @@
+#!/usr/bin/env python
+
 import os, argparse, sys, re
 import zippydoc
 
+import os
+
+_ROOT = os.path.abspath(os.path.dirname(zippydoc.__file__))
+
+def get_data(path):
+	return os.path.join(_ROOT, 'data', path)
+
 parser = argparse.ArgumentParser(description='Converts ZippyDoc source files to HTML.')
 
 parser.add_argument('files', metavar='FILE', type=str, nargs='+',
@@ -93,7 +102,7 @@ class HtmlRuleset(zippydoc.TransformationRuleset):
 
 files = options["files"]
 
-template = open("template.html").read()
+template = open(get_data("template.html")).read()
 
 for zpy in files:
 	destination = os.path.splitext(zpy)[0] + ".html"