diff --git a/command/push.go b/command/push.go
index 981b8c6d7..37dbf5a69 100644
--- a/command/push.go
+++ b/command/push.go
@@ -191,12 +191,21 @@ func (c *PushCommand) Run(args []string) int {
 		return 1
 	}
 
+	// Get the absolute path for our data directory, since the Extra field
+	// value below needs to be absolute.
+	dataDirAbs, err := filepath.Abs(c.DataDir())
+	if err != nil {
+		c.Ui.Error(fmt.Sprintf(
+			"Error while expanding the data directory %q: %s", c.DataDir(), err))
+		return 1
+	}
+
 	// Build the archiving options, which includes everything it can
 	// by default according to VCS rules but forcing the data directory.
 	archiveOpts := &archive.ArchiveOpts{
 		VCS: archiveVCS,
 		Extra: map[string]string{
-			DefaultDataDir: c.DataDir(),
+			DefaultDataDir: dataDirAbs,
 		},
 	}
 	if !moduleUpload {