diff --git a/.gitignore b/.gitignore
index ff67717..31b5095 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,5 +12,14 @@ tmp_Atomfeed.xml
 tmp_Rssfeed.xml
 # JetBrains IDE
 .idea/
+
+# Documentation build
 /doc/_build
 /docs
+
+# Distribution and building the package
+/dist
+/MANIFEST
+/build
+/podgen.egg-info
+
diff --git a/podgen/version.py b/podgen/version.py
index 2e88cfe..ab2af60 100644
--- a/podgen/version.py
+++ b/podgen/version.py
@@ -11,7 +11,7 @@
 """
 
 'Version of python-podgen represented as tuple'
-version = (0, 3, 2)
+version = (1, 0, 0, "dev1")
 
 
 'Version of python-podgen represented as string'
diff --git a/setup.py b/setup.py
index e6e9815..d72f915 100755
--- a/setup.py
+++ b/setup.py
@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-from distutils.core import setup
+from setuptools import setup
 import podgen.version
 
 setup(
@@ -12,7 +12,7 @@
         author = 'Thorben W. S. Dahl',
         author_email = 'thorben@sjostrom.no',
         url = 'http://podgen.readthedocs.io/en/latest/',
-        keywords = ['feed','RSS','podcast','iTunes'],
+        keywords = ['feed', 'RSS', 'podcast', 'iTunes', 'generator'],
         license = 'FreeBSD and LGPLv3+',
         install_requires = ['lxml', 'dateutils', 'future', 'pytz'],
         classifiers = [