diff --git a/sys/arch/amiga/conf/files.amiga b/sys/arch/amiga/conf/files.amiga
index bba980060778..8d46dfad3282 100644
--- a/sys/arch/amiga/conf/files.amiga
+++ b/sys/arch/amiga/conf/files.amiga
@@ -1,4 +1,4 @@
-#	$NetBSD: files.amiga,v 1.82 1999/03/25 23:16:14 is Exp $
+#	$NetBSD: files.amiga,v 1.83 1999/03/25 23:19:59 is Exp $
 
 # maxpartitions must be first item in files.${ARCH}.newconf
 maxpartitions 16			# NOTE THAT AMIGA IS SPECIAL!
@@ -12,8 +12,15 @@ defopt	opt_amigaccgrf.h	GRF_A2024:GRF_ECS
 defopt	opt_amigaccgrf.h	GRF_AGA_VGA:GRF_AGA
 defopt	opt_amigaccgrf.h	GRF_SUPER72:GRF_AGA
 
-device mainbus {}
-attach mainbus at root
+defopt	opt_amigacons.h		RETINACONSOLE ULOWELLCONSOLE CL5426CONSOLE
+defopt	opt_amigacons.h		CV64CONSOLE CV3DCONSOLE TSENGCONSOLE
+defopt	opt_amigacons.h		CV3DONZORRO2
+
+defopt	opt_retina.h		RH_MEMCLK RH_64BIT_SPRITE RH_HARDWARECURSOR
+defopt	opt_retina.h		RETINA_SPEED_HACK
+
+device  mainbus {}
+attach  mainbus at root
 
 device	cpu
 attach	cpu at mainbus
diff --git a/sys/arch/amiga/dev/grf_et.c b/sys/arch/amiga/dev/grf_et.c
index 0ac4daf096f4..9cd713cbfd51 100644
--- a/sys/arch/amiga/dev/grf_et.c
+++ b/sys/arch/amiga/dev/grf_et.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_et.c,v 1.11 1998/01/12 10:39:36 thorpej Exp $	*/
+/*	$NetBSD: grf_et.c,v 1.12 1999/03/25 23:19:59 is Exp $	*/
 
 /*
  * Copyright (c) 1997 Klaus Burkert
@@ -34,6 +34,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include "opt_amigacons.h"
 #include "grfet.h"
 #if NGRFET > 0
 
diff --git a/sys/arch/amiga/dev/grf_rh.c b/sys/arch/amiga/dev/grf_rh.c
index d061fcd6dda3..28b7ab2fd1de 100644
--- a/sys/arch/amiga/dev/grf_rh.c
+++ b/sys/arch/amiga/dev/grf_rh.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: grf_rh.c,v 1.28 1998/01/12 10:39:37 thorpej Exp $	*/
+/*	$NetBSD: grf_rh.c,v 1.29 1999/03/25 23:19:59 is Exp $	*/
 
 /*
  * Copyright (c) 1994 Markus Wild
@@ -30,6 +30,8 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include "opt_amigacons.h"
+#include "opt_retina.h"
 #include "grfrh.h"
 #if NGRFRH > 0
 
diff --git a/sys/arch/amiga/dev/ite_rh.c b/sys/arch/amiga/dev/ite_rh.c
index 0f8ce5f55d58..883691166d65 100644
--- a/sys/arch/amiga/dev/ite_rh.c
+++ b/sys/arch/amiga/dev/ite_rh.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: ite_rh.c,v 1.7 1996/04/23 22:53:05 veego Exp $	*/
+/*	$NetBSD: ite_rh.c,v 1.8 1999/03/25 23:19:59 is Exp $	*/
 
 /*
  * Copyright (c) 1994 Markus Wild
@@ -30,6 +30,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
+#include "opt_retina.h"
 #include "grfrh.h"
 #if NGRFRH > 0