diff --git a/modules/file_manager.py b/modules/file_manager.py
index 913c47e457cba425cec616245b7c42c26a63e4a6..f317f1291b02e9b7599c507b5d78be571a0ad1ac 100644
--- a/modules/file_manager.py
+++ b/modules/file_manager.py
@@ -134,6 +134,14 @@ def prepare_directories(device_definitions, flags):
         cleanup_and_exit("Could not create directory ./" + OUTPUT_DIRECTORY +
                          ".")
 
+    if "extra_vars" in flags and flags["extra_vars"]:
+        try:
+            os.mkdir(OUTPUT_DIRECTORY + "/user_files")
+            shutil.copyfile(flags["extra_vars"],
+                            OUTPUT_DIRECTORY + "/user_files/extra_vars.yml")
+        except IOError:
+            cleanup_and_exit("Could not import extra_vars.")
+
     _create_provisioning_directories("base_provisioning", device_definitions)
     if "provisioning_dir" not in flags or not flags["provisioning_dir"]:
         _create_provisioning_directories("provisioning", device_definitions)
diff --git a/modules/vagrant_generator.py b/modules/vagrant_generator.py
index ff8653ae7d6be8680475f148133b72f7c52fbd35..f6211bbfd49b13306c9c2be60bfa4af6d0952f62 100644
--- a/modules/vagrant_generator.py
+++ b/modules/vagrant_generator.py
@@ -1,7 +1,5 @@
 """Contains functions for generating a Vagrantfile from input definitions."""
 
-import os
-
 from modules.file_manager import generate_file, open_yaml
 
 VAGRANT_MAPPING = open_yaml("conf/vagrant_mapping.yml")