diff --git a/sys/arch/i386/include/spkr.h b/sys/arch/i386/include/spkr.h
new file mode 100644
index 000000000000..71457dd98931
--- /dev/null
+++ b/sys/arch/i386/include/spkr.h
@@ -0,0 +1,31 @@
+/*
+ * spkr.h -- interface definitions for speaker ioctl()
+ *
+ * v1.1 by Eric S. Raymond (esr@snark.thyrsus.com) Feb 1990
+ *      modified for 386bsd by Andrew A. Chernov <ache@astral.msk.su>
+ *      386bsd only clean version, all SYSV stuff removed
+ *
+ *	$Id: spkr.h,v 1.1 1993/06/16 18:12:23 brezak Exp $
+ */
+
+#ifndef _SPKR_H_
+#define _SPKR_H_
+
+#ifndef KERNEL
+#include <sys/ioctl.h>
+#else
+#include "ioctl.h"
+#endif
+
+#define SPKRTONE        _IOW('S', 1, tone_t)    /* emit tone */
+#define SPKRTUNE        _IO('S', 2)             /* emit tone sequence*/
+
+typedef struct
+{
+    int	frequency;	/* in hertz */
+    int duration;	/* in 1/100ths of a second */
+}
+tone_t;
+
+#endif /* _SPKR_H_ */
+/* spkr.h ends here */
diff --git a/sys/arch/i386/isa/spkr.c b/sys/arch/i386/isa/spkr.c
index d2b90eae2fe6..8689f452c49c 100644
--- a/sys/arch/i386/isa/spkr.c
+++ b/sys/arch/i386/isa/spkr.c
@@ -6,7 +6,7 @@
  *      386bsd only clean version, all SYSV stuff removed
  *      use hz value from param.c
  *
- *	$Id: spkr.c,v 1.3 1993/06/15 21:37:18 mycroft Exp $
+ *	$Id: spkr.c,v 1.4 1993/06/16 18:12:28 brezak Exp $
  */
 
 #include "speaker.h"
@@ -18,7 +18,7 @@
 #include "errno.h"
 #include "buf.h"
 #include "uio.h"
-#include "spkr.h"
+#include "i386/include/spkr.h"
 
 /**************** MACHINE DEPENDENT PART STARTS HERE *************************
  *