diff --git a/sys/conf/options b/sys/conf/options
index 9387b4c..4d2af3e 100644
--- a/sys/conf/options
+++ b/sys/conf/options
@@ -601,6 +601,9 @@ KTR_TSLEEP			opt_ktr.h
 KTR_USB_MEMORY			opt_ktr.h
 KTR_VERBOSE			opt_ktr.h
 
+# NTFS options
+NTFS_DEBUG			opt_ntfs.h
+
 # options for the Atheros driver
 ATH_DEBUG		opt_ath.h
 ATH_DIAGAPI		opt_ath.h
diff --git a/sys/config/LINT b/sys/config/LINT
index ad79a5f..f86e5ec 100644
--- a/sys/config/LINT
+++ b/sys/config/LINT
@@ -787,6 +787,9 @@ options 	NFS_WDELAYHASHSIZ=16	# and with this
 options 	NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
 options 	NFS_DEBUG		# Enable NFS Debugging
 
+# NTFS options:
+options                NTFS_DEBUG
+
 # MSDOSFS options:
 options		MSDOSFS_DEBUG		# Enable MSDOSFS Debugging
 
diff --git a/sys/config/LINT64 b/sys/config/LINT64
index 26b7b5a..a59a9a5 100644
--- a/sys/config/LINT64
+++ b/sys/config/LINT64
@@ -641,6 +641,9 @@ options 	NFS_WDELAYHASHSIZ=16	# and with this
 options 	NFS_MUIDHASHSIZ=63	# Tune the size of nfsmount with this
 options 	NFS_DEBUG		# Enable NFS Debugging
 
+# NTFS options:
+options		NTFS_DEBUG
+
 # MSDOSFS options:
 options		MSDOSFS_DEBUG		# Enable MSDOSFS Debugging
 
diff --git a/sys/vfs/ntfs/Makefile b/sys/vfs/ntfs/Makefile
index 91220b9..58734f0 100644
--- a/sys/vfs/ntfs/Makefile
+++ b/sys/vfs/ntfs/Makefile
@@ -5,5 +5,7 @@ KMOD=	ntfs
 SRCS=	ntfs_vfsops.c ntfs_vnops.c ntfs_subr.c ntfs_ihash.c \
 	ntfs_compr.c
 
+SRCS+=	opt_ntfs.h
+
 SUBDIR= ntfs_iconv
 .include <bsd.kmod.mk>
diff --git a/sys/vfs/ntfs/ntfs.h b/sys/vfs/ntfs/ntfs.h
index 712d6d9..f90caa2 100644
--- a/sys/vfs/ntfs/ntfs.h
+++ b/sys/vfs/ntfs/ntfs.h
@@ -28,13 +28,11 @@
  * $FreeBSD: src/sys/ntfs/ntfs.h,v 1.8.2.2 2001/10/12 22:08:49 semenu Exp $
  */
 
-/*#define NTFS_DEBUG 1*/
-#if defined(__NetBSD__) && defined(_KERNEL) && !defined(_LKM)
+#ifdef _KERNEL
 #include "opt_ntfs.h"
 #endif
-#if defined(__DragonFly__)
 #include <sys/thread2.h>
-#endif
+
 
 typedef u_int64_t cn_t;
 typedef u_int16_t wchar;
diff --git a/sys/vfs/ntfs/ntfs_subr.c b/sys/vfs/ntfs/ntfs_subr.c
index 5fbbcce..e94039f 100644
--- a/sys/vfs/ntfs/ntfs_subr.c
+++ b/sys/vfs/ntfs/ntfs_subr.c
@@ -52,7 +52,6 @@
 #include <miscfs/specfs/specdev.h>
 #endif
 
-/* #define NTFS_DEBUG 1 */
 #include "ntfs.h"
 #include "ntfsmount.h"
 #include "ntfs_inode.h"
diff --git a/sys/vfs/ntfs/ntfs_vfsops.c b/sys/vfs/ntfs/ntfs_vfsops.c
index d0195ee..5935b85 100644
--- a/sys/vfs/ntfs/ntfs_vfsops.c
+++ b/sys/vfs/ntfs/ntfs_vfsops.c
@@ -63,7 +63,6 @@
 
 #include <sys/buf2.h>
 
-/*#define NTFS_DEBUG 1*/
 #include "ntfs.h"
 #include "ntfs_inode.h"
 #include "ntfs_subr.h"
diff --git a/sys/vfs/ntfs/ntfs_vnops.c b/sys/vfs/ntfs/ntfs_vnops.c
index e63ab1b..557d645 100644
--- a/sys/vfs/ntfs/ntfs_vnops.c
+++ b/sys/vfs/ntfs/ntfs_vnops.c
@@ -71,7 +71,6 @@
 
 #include <sys/buf2.h>
 
-/*#define NTFS_DEBUG 1*/
 #include "ntfs.h"
 #include "ntfs_inode.h"
 #include "ntfs_subr.h"