diff --git a/.gitignore b/.gitignore
index 80ff305..2d5a4fd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 *.pyc
 *.sublime-*
-
+build/*
+dist/*
diff --git a/MANIFEST b/MANIFEST
new file mode 100644
index 0000000..3c2c1b6
--- /dev/null
+++ b/MANIFEST
@@ -0,0 +1,4 @@
+# file GENERATED by distutils, do NOT edit
+setup.py
+software_versions/__init__.py
+software_versions/versions.py
diff --git a/README.md b/README.md
index 920c663..466fca7 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 ## software_versions ##
 
-Python script for pulling latest software versions from respective vendors' web sites.
+Python module for pulling latest software versions from respective vendors' web sites.
 
-For more details, visit 
+For more details, visit
   http://krivokuca.net/2012/09/software_versions-python-module-stable-release/
diff --git a/demo.py b/demo.py
index 33b9f36..531bb92 100755
--- a/demo.py
+++ b/demo.py
@@ -11,7 +11,7 @@
 
 def main():
 
-    from software import versions as ver
+    from software_versions import versions as ver
 
     print ("Sendmail:            %s" % (ver.check_sendmail()))
     print ("ISC BIND:            %s" % (ver.check_bind()))
@@ -33,7 +33,7 @@ def main():
 
 
 def set_include_path():
-    include_path = os.path.abspath("./include/")
+    include_path = os.path.abspath("./")
     sys.path.append(include_path)
 
 
diff --git a/setup.py b/setup.py
new file mode 100644
index 0000000..f27561f
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,13 @@
+#!/usr/bin/env python
+
+from distutils.core import setup
+
+setup(name='software_versions',
+    version='1.0.3',
+    description='Python script for pulling latest software versions from '
+        'the respective vendors\' web sites',
+    author='Vedran Krivokuca',
+    author_email='dev@krivokuca.net',
+    url='https://github.com/casastorta/software_versions',
+    packages=['software_versions'],
+)
diff --git a/include/software/__init__.py b/software_versions/__init__.py
similarity index 100%
rename from include/software/__init__.py
rename to software_versions/__init__.py
diff --git a/include/software/versions.py b/software_versions/versions.py
similarity index 99%
rename from include/software/versions.py
rename to software_versions/versions.py
index 05d6974..58c96b0 100644
--- a/include/software/versions.py
+++ b/software_versions/versions.py
@@ -5,7 +5,7 @@
 '''
 
 from types import NoneType
-import software as sftw
+import software_versions as sftw
 import re
 import urllib
 import sys
diff --git a/unittest/versions_test.py b/unittest/versions_test.py
index 34be67b..50edcbe 100755
--- a/unittest/versions_test.py
+++ b/unittest/versions_test.py
@@ -161,7 +161,7 @@ def __test_version(self, input_values=None):
 
 
 def set_include_path():
-    include_path = os.path.abspath("../include/")
+    include_path = os.path.abspath("../")
     sys.path.append(include_path)