diff --git a/Makefile.in b/Makefile.in
index 5ca3b08..c779c3a 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -59,8 +59,8 @@ DIST_COMMON = README $(am__configure_deps) $(libtins_HEADERS) \
 	$(libtins_dot11_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/libtins.pc.in \
 	$(top_srcdir)/configure $(top_srcdir)/include/config.h.in \
-	AUTHORS INSTALL THANKS config.guess config.sub depcomp \
-	install-sh ltmain.sh missing
+	AUTHORS COPYING INSTALL THANKS TODO config.guess config.sub \
+	depcomp install-sh ltmain.sh missing
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/ax_cxx_compile_stdcxx_11.m4 \
 	$(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
diff --git a/include/crypto.h b/include/crypto.h
index 3b08b2f..99d704f 100644
--- a/include/crypto.h
+++ b/include/crypto.h
@@ -330,6 +330,7 @@ namespace Crypto {
     template<typename Functor>
     DecrypterProxy<Functor, WEPDecrypter> make_wep_decrypter_proxy(const Functor &functor);
 
+    #ifdef HAVE_WPA2_DECRYPTION
     /**
      * \brief Wrapper function to create a DecrypterProxy using a 
      * WPA2Decrypter as the Decrypter template parameter.
@@ -338,7 +339,10 @@ namespace Crypto {
      * constructor.
      */
     template<typename Functor>
-    DecrypterProxy<Functor, WPA2Decrypter> make_wpa2_decrypter_proxy(const Functor &functor);
+    DecrypterProxy<Functor, WPA2Decrypter> make_wpa2_decrypter_proxy(const Functor &functor) {
+        return DecrypterProxy<Functor, WPA2Decrypter>(functor);
+    }
+    #endif // HAVE_WPA2_DECRYPTION
     
     // Implementation section
     
@@ -378,12 +382,6 @@ namespace Crypto {
         return DecrypterProxy<Functor, WEPDecrypter>(functor);
     }
 
-    template<typename Functor>
-    DecrypterProxy<Functor, WPA2Decrypter> make_wpa2_decrypter_proxy(const Functor &functor)
-    {
-        return DecrypterProxy<Functor, WPA2Decrypter>(functor);
-    }
-    
     // RC4 stuff
     
     template<typename ForwardIterator>
diff --git a/src/crypto.cpp b/src/crypto.cpp
index bca6b36..4e0822a 100644
--- a/src/crypto.cpp
+++ b/src/crypto.cpp
@@ -27,10 +27,12 @@
  *
  */
 
-#include <openssl/evp.h>
-#include <openssl/hmac.h>
-#include <openssl/aes.h>
 #include "crypto.h"
+#ifdef HAVE_WPA2_DECRYPTION
+    #include <openssl/evp.h>
+    #include <openssl/hmac.h>
+    #include <openssl/aes.h>
+#endif // HAVE_WPA2_DECRYPTION
 #include "dot11/dot11_data.h"
 #include "dot11/dot11_beacon.h"