diff --git a/configure.ac b/configure.ac
index 4eb1c65..d85c440 100644
--- a/configure.ac
+++ b/configure.ac
@@ -579,6 +579,7 @@ AC_ARG_ENABLE(module-smbnt-smb2,
 
 AM_CONDITIONAL(BUILD_MODULE_SMBNT_SMB2, test x"$enable_module_smbnt_smb2" = "xtrue")
 if test x"$enable_module_smbnt_smb2" = "xtrue"; then
+  AC_DEFINE(SMBNT_SMB2_SUPPORT_ENABLED, 1, [SMBNT SMBv2 Support Enabled])
   AC_MSG_RESULT(yes)
 else
   AC_MSG_RESULT(no)
diff --git a/src/modsrc/smbnt-smb2.c b/src/modsrc/smbnt-smb2.c
index a240c00..46fe0c7 100644
--- a/src/modsrc/smbnt-smb2.c
+++ b/src/modsrc/smbnt-smb2.c
@@ -1,6 +1,6 @@
 #include "smbnt.h"
 
-#ifdef BUILD_MODULE_SMBNT_SMB2
+#ifdef SMBNT_SMB2_SUPPORT_ENABLED 
 
 #define SMBv2 16
 
diff --git a/src/modsrc/smbnt.c b/src/modsrc/smbnt.c
index e370422..8c8ecea 100644
--- a/src/modsrc/smbnt.c
+++ b/src/modsrc/smbnt.c
@@ -420,7 +420,7 @@ int initModule(sLogin* psLogin, _SMBNT_DATA *_psSessionData)
         if (hSocket > 0)
           medusaDisconnect(hSocket);
         hSocket = -1;
-#ifdef BUILD_MODULE_SMBNT_SMB2        
+#ifdef SMBNT_SMB2_SUPPORT_ENABLED
         smb2_destroy_context(_psSessionData->smb2);
 #endif
         nState = MSTATE_COMPLETE;
@@ -430,7 +430,7 @@ int initModule(sLogin* psLogin, _SMBNT_DATA *_psSessionData)
         if (hSocket > 0)
           medusaDisconnect(hSocket);
         hSocket = -1;
-#ifdef BUILD_MODULE_SMBNT_SMB2        
+#ifdef SMBNT_SMB2_SUPPORT_ENABLED
         smb2_destroy_context(_psSessionData->smb2);
 #endif
         psLogin->iResult = LOGIN_RESULT_UNKNOWN;
@@ -517,7 +517,7 @@ int tryLogin(int hSocket, sLogin** psLogin, _SMBNT_DATA* _psSessionData, char* s
   } else {
     SMBSessionRet = SMBSessionSetup(hSocket, psLogin, _psSessionData, szLogin, szPassword);
   }
-  
+
   SMBerr = (unsigned long) SMBSessionRet & 0x00FFFFFF;
   SMBaction = ((unsigned long) SMBSessionRet & 0xFF000000) >> 24;