diff --git a/buildman/component/buildcomponent.py b/buildman/component/buildcomponent.py
index eeb6d0dba..075285334 100644
--- a/buildman/component/buildcomponent.py
+++ b/buildman/component/buildcomponent.py
@@ -126,6 +126,14 @@ class BuildComponent(BaseComponent):
 
     subdir, dockerfile_name = os.path.split(build_config.get('build_subdir', '/Dockerfile'))
 
+    # HACK HACK HACK HACK HACK HACK HACK
+    # TODO: FIX THIS in the database and then turn the split back on.
+    if dockerfile_name.find('Dockerfile') < 0:
+      # This is a *HACK* for the broken path handling. To be fixed ASAP.
+      subdir = build_config.get('build_subdir') or '/'
+      dockerfile_name = 'Dockerfile'
+    # /HACK HACK HACK HACK HACK HACK HACK
+
     build_arguments = {
       'build_package': build_job.get_build_package_url(self.user_files),
       'sub_directory': subdir,