diff --git a/cbits/aes/ni/aes_x86ni.c b/cbits/aes/ni/aes_x86ni.c
--- a/cbits/aes/ni/aes_x86ni.c
+++ b/cbits/aes/ni/aes_x86ni.c
@@ -27,6 +27,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
+#if defined(HAVE_AES_INTRINSICS) && !defined(AVOID_NI)
 
 #include <wmmintrin.h>
 #include <tmmintrin.h>
@@ -269,3 +270,5 @@
 }
 
 #endif /* x86 */
+
+#endif /* HAVE_AES_INTRINSICS */
diff --git a/cipher-aes128.cabal b/cipher-aes128.cabal
--- a/cipher-aes128.cabal
+++ b/cipher-aes128.cabal
@@ -2,7 +2,7 @@
 -- documentation, see http://haskell.org/cabal/users-guide/
 
 name:                cipher-aes128
-version:             0.2.4
+version:             0.2.5
 synopsis:            AES128 using AES-NI when available.
 description:         AES128 with crypto-api instances and a trampoline between Vincent Hanquez's C-based and x86 NI-based AES.  Patches welcome to add additional high-performance backends (ARM?)
 license:             BSD3
@@ -12,7 +12,7 @@
 copyright:           Thomas M. DuBuisson
 category:            Cryptography
 homepage:            https://github.com/TomMD/cipher-aes128
-bug-reports:         https://github.com/TomMD/cipher-aes128
+bug-reports:         https://github.com/TomMD/cipher-aes128/issues
 build-type:          Custom
 cabal-version:       >=1.12