diff --git a/basalt/tasks/__init__.py b/basalt/tasks/__init__.py
index 8b3d651..d5a8fb2 100644
--- a/basalt/tasks/__init__.py
+++ b/basalt/tasks/__init__.py
@@ -1,10 +1,16 @@
-from dict_config_parser import DictConfigParser
-from config_generator import generate_config
-from config_generator import get_config_vars
-from fs_commands import mkdirp
-from simple_version import get_major_version
-from simple_version import get_minor_version
-from simple_version import get_minor_version_with_increment
-from package_generator import package
-from vcs_info import get_commit_rev
-from vcs_info import get_branch
+try:
+    # python 2.x
+    from dict_config_parser import DictConfigParser
+except ImportError:
+    # python 3.x
+    from configparser import ConfigParser
+
+from .config_generator import generate_config
+from .config_generator import get_config_vars
+from .fs_commands import mkdirp
+from .simple_version import get_major_version
+from .simple_version import get_minor_version
+from .simple_version import get_minor_version_with_increment
+from .package_generator import package
+from .vcs_info import get_commit_rev
+from .vcs_info import get_branch
diff --git a/basalt/tasks/config_generator.py b/basalt/tasks/config_generator.py
index 461c778..903c2cc 100644
--- a/basalt/tasks/config_generator.py
+++ b/basalt/tasks/config_generator.py
@@ -2,8 +2,8 @@
 import sys
 import yaml
 
-from utils import print_err
-from fs_commands import mkdirp
+from .utils import print_err
+from .fs_commands import mkdirp
 from jinja2 import Template, Environment, FileSystemLoader
 
 env = Environment(loader=FileSystemLoader('templates'))
@@ -22,7 +22,7 @@ def generate_config(template_name, config, outputfile, section="build-vars"):
     """\
     Generates a config from a template and with values from the yaml config.
 
-    A section can optionally be passed if somthing else than 'build-vars' should be used. 
+    A section can optionally be passed if somthing else than 'build-vars' should be used.
     """
     config_vars = get_config_vars(config)
     script_template = env.get_template(template_name)