diff --git a/CHANGES b/CHANGES
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+0.3.18
+
+* `ShortByteString` instances for all supported `bytestring`
+
 0.3.17
 
 * Support GHC-8.4.1
diff --git a/quickcheck-instances.cabal b/quickcheck-instances.cabal
--- a/quickcheck-instances.cabal
+++ b/quickcheck-instances.cabal
@@ -1,5 +1,5 @@
 Name:                quickcheck-instances
-Version:             0.3.17
+Version:             0.3.18
 Synopsis:            Common quickcheck instances
 Description:         QuickCheck instances.
                      .
@@ -39,6 +39,11 @@
   type:     git
   location: https://github.com/phadej/qc-instances.git
 
+Flag bytestring-builder
+  description: Use bytestring-builder (with old bytestring)
+  default: False
+  manual: False
+
 Library
   Exposed-modules:     Test.QuickCheck.Instances
                        Test.QuickCheck.Instances.Array
@@ -86,6 +91,14 @@
   if !impl(ghc >= 7.10)
     build-depends:
       nats >=1 && <1.2
+
+  if flag(bytestring-builder)
+    build-depends:
+      bytestring-builder   >=0.10.4  && <0.11,
+      bytestring <0.10.4.0
+  else
+    build-depends:
+      bytestring >=0.10.4.0
 
   Ghc-options:         -Wall
 
diff --git a/src/Test/QuickCheck/Instances/ByteString.hs b/src/Test/QuickCheck/Instances/ByteString.hs
--- a/src/Test/QuickCheck/Instances/ByteString.hs
+++ b/src/Test/QuickCheck/Instances/ByteString.hs
@@ -1,4 +1,3 @@
-{-# LANGUAGE CPP #-}
 {-# LANGUAGE FlexibleContexts #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 module Test.QuickCheck.Instances.ByteString () where
@@ -10,9 +9,7 @@
 
 import qualified Data.ByteString as BS
 import qualified Data.ByteString.Lazy as BL
-#if MIN_VERSION_bytestring(0,10,4)
 import qualified Data.ByteString.Short as SBS
-#endif
 
 -------------------------------------------------------------------------------
 -- bytestring
@@ -40,7 +37,6 @@
     function = functionMap BL.unpack BL.pack
 
 
-#if MIN_VERSION_bytestring(0,10,4)
 instance Arbitrary SBS.ShortByteString where
     arbitrary = SBS.pack <$> arbitrary
     shrink xs = SBS.pack <$> shrink (SBS.unpack xs)
@@ -50,4 +46,3 @@
 
 instance Function SBS.ShortByteString where
     function = functionMap SBS.unpack SBS.pack
-#endif