diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py
index 9b3d67fa..d143b911 100755
--- a/gbp/scripts/buildpackage.py
+++ b/gbp/scripts/buildpackage.py
@@ -538,7 +538,7 @@ def main(argv):
 
             # Export to another build dir if requested:
             if options.export_dir:
-                export_source(repo, tree, source, options, tmp_dir, tarball_dir)
+                export_source(repo, tree, source, options, tmp_dir, output_dir)
 
                 # Run postexport hook
                 if options.postexport:
diff --git a/tests/component/deb/test_buildpackage.py b/tests/component/deb/test_buildpackage.py
index fe0802a0..cfd06ce5 100644
--- a/tests/component/deb/test_buildpackage.py
+++ b/tests/component/deb/test_buildpackage.py
@@ -177,6 +177,14 @@ def test_export_dir_buildpackage(self, repo):
         self._test_buildpackage(repo, ['--git-export-dir=../foo/bar'])
         ok_(os.path.exists('../foo/bar'))
 
+    @RepoFixtures.quilt30()
+    def test_export_dir_with_tarball_dir_buildpackage(self, repo):
+        """Test that building with a export dir and tarball dir (without the actual tarball) works"""
+        self._test_buildpackage(repo, ['--git-export-dir=../foo/bar',
+                                       '--git-tarball-dir=../foo',
+                                       '--git-overlay'])
+        ok_(os.path.exists('../foo/bar'))
+
     @RepoFixtures.quilt30_additional_tarball()
     def test_export_dir_additional_tar(self, repo):
         """Test that building with a export dir and additional tarball works"""