diff --git a/sys/conf/files b/sys/conf/files
index 721db4835dab..2220155885a8 100644
--- a/sys/conf/files
+++ b/sys/conf/files
@@ -1,4 +1,4 @@
-#	$NetBSD: files,v 1.688 2004/10/01 05:16:04 thorpej Exp $
+#	$NetBSD: files,v 1.689 2004/10/04 01:07:25 thorpej Exp $
 
 #	@(#)files.newconf	7.5 (Berkeley) 5/10/93
 
@@ -61,6 +61,7 @@ defflag	opt_execfmt.h		EXEC_AOUT EXEC_COFF EXEC_ECOFF EXEC_ELF32
 				EXEC_ELF_NOTELESS
 
 defflag	opt_dkwedge.h		DKWEDGE_AUTODISCOVER
+				DKWEDGE_METHOD_BSDLABEL
 				DKWEDGE_METHOD_GPT
 
 # compatibility options
@@ -1145,9 +1146,9 @@ file	dev/cgd.c			cgd			needs-flag
 file	dev/cgd_crypto.c		cgd
 file	dev/clock_subr.c
 file	dev/clockctl.c			clockctl		needs-flag
-file	dev/dk.c
-file	dev/dkwedge_gpt.c		dkwedge_method_gpt
 file	dev/dksubr.c			cgd | xbd
+file	dev/dkwedge/dk.c
+file	dev/dkwedge/dkwedge_gpt.c	dkwedge_method_gpt
 file	dev/fss.c			fss			needs-count
 file	dev/md.c			md			needs-count
 file	dev/midi.c			midi | midibus		needs-flag
diff --git a/sys/dev/dk.c b/sys/dev/dkwedge/dk.c
similarity index 99%
rename from sys/dev/dk.c
rename to sys/dev/dkwedge/dk.c
index 1a61e9b499c9..2f762b397e6a 100644
--- a/sys/dev/dk.c
+++ b/sys/dev/dkwedge/dk.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dk.c,v 1.6 2004/10/01 05:16:04 thorpej Exp $	*/
+/*	$NetBSD: dk.c,v 1.1 2004/10/04 01:07:25 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.6 2004/10/01 05:16:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dk.c,v 1.1 2004/10/04 01:07:25 thorpej Exp $");
 
 #include "opt_dkwedge.h"
 
diff --git a/sys/dev/dkwedge_gpt.c b/sys/dev/dkwedge/dkwedge_gpt.c
similarity index 98%
rename from sys/dev/dkwedge_gpt.c
rename to sys/dev/dkwedge/dkwedge_gpt.c
index 4efbdd6a4f81..8cf56f1d12af 100644
--- a/sys/dev/dkwedge_gpt.c
+++ b/sys/dev/dkwedge/dkwedge_gpt.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: dkwedge_gpt.c,v 1.1 2004/10/01 05:16:04 thorpej Exp $	*/
+/*	$NetBSD: dkwedge_gpt.c,v 1.1 2004/10/04 01:07:25 thorpej Exp $	*/
 
 /*-
  * Copyright (c) 2004 The NetBSD Foundation, Inc.
@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.1 2004/10/01 05:16:04 thorpej Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dkwedge_gpt.c,v 1.1 2004/10/04 01:07:25 thorpej Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>