diff --git a/libpod/container_commit.go b/libpod/container_commit.go
index ae04f67bba..739fcd80e4 100644
--- a/libpod/container_commit.go
+++ b/libpod/container_commit.go
@@ -99,7 +99,7 @@ func (c *Container) Commit(ctx context.Context, destImage string, options Contai
 	// Should we store the ENV we actually want in the spec separately?
 	if c.config.Spec.Process != nil {
 		for _, e := range c.config.Spec.Process.Env {
-			splitEnv := strings.Split(e, "=")
+			splitEnv := strings.SplitN(e, "=", 2)
 			importBuilder.SetEnv(splitEnv[0], splitEnv[1])
 		}
 	}
diff --git a/test/e2e/commit_test.go b/test/e2e/commit_test.go
index 3ece4887e6..bf20ac999f 100644
--- a/test/e2e/commit_test.go
+++ b/test/e2e/commit_test.go
@@ -194,4 +194,24 @@ var _ = Describe("Podman commit", func() {
 		Expect(r.ExitCode()).To(Equal(0))
 	})
 
+	It("podman commit container check env variables", func() {
+		s := podmanTest.Podman([]string{"run", "--name", "test1", "-e", "TEST=1=1-01=9.01", "-it", "alpine", "true"})
+		s.WaitWithDefaultTimeout()
+		Expect(s.ExitCode()).To(Equal(0))
+
+		c := podmanTest.Podman([]string{"commit", "test1", "newimage"})
+		c.WaitWithDefaultTimeout()
+		Expect(c.ExitCode()).To(Equal(0))
+
+		inspect := podmanTest.Podman([]string{"inspect", "newimage"})
+		inspect.WaitWithDefaultTimeout()
+		Expect(inspect.ExitCode()).To(Equal(0))
+		image := inspect.InspectImageJSON()
+
+		envMap := make(map[string]bool)
+		for _, v := range image[0].Config.Env {
+			envMap[v] = true
+		}
+		Expect(envMap["TEST=1=1-01=9.01"]).To(BeTrue())
+	})
 })