diff --git a/compy_test.go b/compy_test.go
index a728b8b..9fdcdc6 100644
--- a/compy_test.go
+++ b/compy_test.go
@@ -5,6 +5,7 @@ import (
 
 	gzipp "compress/gzip"
 	jpegp "image/jpeg"
+	pngp "image/png"
 	"io/ioutil"
 	"net/http"
 	"net/http/httptest"
@@ -35,6 +36,7 @@ func (s *CompyTest) SetUpSuite(c *C) {
 
 	s.proxy = proxy.New()
 	s.proxy.AddTranscoder("image/jpeg", tc.NewJpeg(50))
+	s.proxy.AddTranscoder("image/png", &tc.Png{})
 	s.proxy.AddTranscoder("text/html", &tc.Zip{&tc.Identity{}, *brotli, *gzip, true})
 	go func() {
 		err := s.proxy.Start(*host)
@@ -123,7 +125,7 @@ func (s *CompyTest) TestJpeg(c *C) {
 	c.Assert(err, IsNil)
 }
 
-func (s *CompyTest) TestWebP(c *C) {
+func (s *CompyTest) TestJpegToWebP(c *C) {
 	req, err := http.NewRequest("GET", s.server.URL+"/image/jpeg", nil)
 	c.Assert(err, IsNil)
 	req.Header.Add("Accept", "image/webp,image/jpeg")
@@ -137,3 +139,31 @@ func (s *CompyTest) TestWebP(c *C) {
 	_, err = webp.Decode(resp.Body)
 	c.Assert(err, IsNil)
 }
+
+func (s *CompyTest) TestPng(c *C) {
+	req, err := http.NewRequest("GET", s.server.URL+"/image/png", nil)
+	c.Assert(err, IsNil)
+
+	resp, err := s.client.Do(req)
+	c.Assert(err, IsNil)
+	defer resp.Body.Close()
+	c.Assert(resp.StatusCode, Equals, 200)
+	c.Assert(resp.Header.Get("Content-Type"), Equals, "image/png")
+
+	_, err = pngp.Decode(resp.Body)
+	c.Assert(err, IsNil)
+}
+func (s *CompyTest) TestPngToWebP(c *C) {
+	req, err := http.NewRequest("GET", s.server.URL+"/image/png", nil)
+	c.Assert(err, IsNil)
+	req.Header.Add("Accept", "image/webp")
+
+	resp, err := s.client.Do(req)
+	c.Assert(err, IsNil)
+	defer resp.Body.Close()
+	c.Assert(resp.StatusCode, Equals, 200)
+	c.Assert(resp.Header.Get("Content-Type"), Equals, "image/webp")
+
+	_, err = webp.Decode(resp.Body)
+	c.Assert(err, IsNil)
+}
diff --git a/transcoder/png.go b/transcoder/png.go
index 407ef50..06a6fea 100644
--- a/transcoder/png.go
+++ b/transcoder/png.go
@@ -16,6 +16,7 @@ func (t *Png) Transcode(w *proxy.ResponseWriter, r *proxy.ResponseReader, header
 	}
 
 	if SupportsWebP(headers) {
+		w.Header().Set("Content-Type", "image/webp")
 		options := webp.Options{
 			Lossless: true,
 		}