diff --git a/ChangeLog.md b/ChangeLog.md
--- a/ChangeLog.md
+++ b/ChangeLog.md
@@ -1,5 +1,9 @@
 # ChangeLog for conduit
 
+## 1.3.6.1
+
+* Forward compatibility with `-Wnoncanonical-monad-instances` becoming an error
+
 ## 1.3.6
 
 * Avoid dropping upstream items in `mergeSource` [#513](https://github.com/snoyberg/conduit/pull/513)
diff --git a/conduit.cabal b/conduit.cabal
--- a/conduit.cabal
+++ b/conduit.cabal
@@ -1,5 +1,5 @@
 Name:                conduit
-Version:             1.3.6
+Version:             1.3.6.1
 Synopsis:            Streaming data processing library.
 description:
     `conduit` is a solution to the streaming data problem, allowing for production,
@@ -98,8 +98,8 @@
                    , unliftio >= 0.2.4.0
     ghc-options:     -Wall
 
-  if os(windows)
-    cpp-options:     -DWINDOWS
+    if os(windows)
+      cpp-options:     -DWINDOWS
 
 --test-suite doctests
 --    hs-source-dirs: test
diff --git a/src/Data/Conduit/Internal/Conduit.hs b/src/Data/Conduit/Internal/Conduit.hs
--- a/src/Data/Conduit/Internal/Conduit.hs
+++ b/src/Data/Conduit/Internal/Conduit.hs
@@ -148,7 +148,7 @@
     {-# INLINE pure #-}
     (<*>) = ap
     {-# INLINE (<*>) #-}
-    (*>) = (>>)
+    x *> y = x >>= \_ -> y
     {-# INLINE (*>) #-}
 
 instance Monad (ConduitT i o m) where