diff --git a/sys/modules/3dfx/Makefile b/sys/modules/3dfx/Makefile
index 6f97d3ea006..d5cfd09da9b 100644
--- a/sys/modules/3dfx/Makefile
+++ b/sys/modules/3dfx/Makefile
@@ -1,3 +1,4 @@
+# $FreeBSD$
 .PATH: $(.CURDIR)/../../dev/tdfx
 KMOD		= tdfx
 NOMAN		= YES
@@ -6,13 +7,12 @@ SRCS		= opt_tdfx.h  pci.h bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\
 INCSRC		= ../../sys
 
 # Uncomment this for debugging messages
-TDFX_VERBOSE = "\#define TDFX_VERBOSE"
+#CFLAGS += -DDEBUG
 
-# kludge to allow opt_tdfx.h to exist
-pci.h: opt_tdfx.h
+pci.h:
 	echo "#define NPCI 1" > pci.h
 
 opt_tdfx.h:
-	echo $(TDFX_VERBOSE) > opt_tdfx.h
+	touch opt_tdfx.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/tdfx/Makefile b/sys/modules/tdfx/Makefile
index 6f97d3ea006..d5cfd09da9b 100644
--- a/sys/modules/tdfx/Makefile
+++ b/sys/modules/tdfx/Makefile
@@ -1,3 +1,4 @@
+# $FreeBSD$
 .PATH: $(.CURDIR)/../../dev/tdfx
 KMOD		= tdfx
 NOMAN		= YES
@@ -6,13 +7,12 @@ SRCS		= opt_tdfx.h  pci.h bus_if.h pci_if.h device_if.h tdfx_pci.h tdfx_io.h\
 INCSRC		= ../../sys
 
 # Uncomment this for debugging messages
-TDFX_VERBOSE = "\#define TDFX_VERBOSE"
+#CFLAGS += -DDEBUG
 
-# kludge to allow opt_tdfx.h to exist
-pci.h: opt_tdfx.h
+pci.h:
 	echo "#define NPCI 1" > pci.h
 
 opt_tdfx.h:
-	echo $(TDFX_VERBOSE) > opt_tdfx.h
+	touch opt_tdfx.h
 
 .include <bsd.kmod.mk>
diff --git a/sys/modules/tdfx/README.linuxemu b/sys/modules/tdfx/README.linuxemu
new file mode 100644
index 00000000000..0ebce9e8d9c
--- /dev/null
+++ b/sys/modules/tdfx/README.linuxemu
@@ -0,0 +1,10 @@
+$FreeBSD$
+NOTIC TO USERS OF LINUX EMULATION CODE
+
+Due to some strange workings with the linuxulator, as of 21 Jun 200, this
+module won't load support for linux emulation, making it rather pointless,
+as there are no non-linux glide progs for freebsd yet. You can, however,
+compile both of them statically into the kernel using:
+device tdfx
+options COMPAT_LINUX
+options LINUX_TDFX