diff --git a/src/hardware/cmos.cpp b/src/hardware/cmos.cpp
index 0b113e8a..b28b1494 100644
--- a/src/hardware/cmos.cpp
+++ b/src/hardware/cmos.cpp
@@ -16,16 +16,18 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include <time.h>
+
 #include "dosbox.h"
 #include "timer.h"
 #include "pic.h"
 #include "inout.h"
-#include "config.h"
+#include "mem.h"
 
 static struct {
-
 	Bit8u regs[0x40];
 	bool nmi;
+	bool bcd;
 	Bit8u reg;
 	struct {
 		bool enabled;
@@ -35,7 +37,6 @@ static struct {
 	Bit8u status_c;
 	bool ack;
 	bool update_ended;
-
 } cmos;
 
 static void cmos_timerevent(void) {
@@ -64,17 +65,21 @@ void cmos_selreg(Bit32u port,Bit8u val) {
 static void cmos_writereg(Bit32u port,Bit8u val) {
 	switch (cmos.reg) {
 	case 0x00:		/* Seconds */
-	case 0x01:		/* Seconds Alarm */
 	case 0x02:		/* Minutes */
-	case 0x03:		/* Minutes Alarm */
 	case 0x04:		/* Hours */
-	case 0x05:		/* Hours Alarm */
 	case 0x06:		/* Day of week */
 	case 0x07:		/* Date of month */
 	case 0x08:		/* Month */
 	case 0x09:		/* Year */
+		/* Ignore writes to change alarm */
+		break;
+	case 0x01:		/* Seconds Alarm */
+	case 0x03:		/* Minutes Alarm */
+	case 0x05:		/* Hours Alarm */
+		LOG(LOG_BIOS,"CMOS:Trying to set alarm");
 		cmos.regs[cmos.reg]=val;
 		break;
+
 	case 0x0a:		/* Status reg A */
 		cmos.regs[cmos.reg]=val & 0x7f;
 		if (val & 0x70!=0x20) LOG(LOG_ERROR|LOG_BIOS,"CMOS Illegal 22 stage divider value");
@@ -82,30 +87,71 @@ static void cmos_writereg(Bit32u port,Bit8u val) {
 		cmos_checktimer();
 		break;
 	case 0x0b:		/* Status reg B */
+		cmos.bcd=!(val & 0x4);
 		cmos.regs[cmos.reg]=val & 0x7f;
 		cmos.timer.enabled=(val & 0x40)>0;
 		if (val&0x10) LOG(LOG_ERROR|LOG_BIOS,"CMOS:Updated ended interrupt not supported yet");
 		cmos_checktimer();
 		break;
+	case 0x0f:		/* Shutdown status byte */
+		cmos.regs[cmos.reg]=val & 0x7f;
+		break;
 	default:
 		cmos.regs[cmos.reg]=val & 0x7f;
-//		LOG(LOG_ERROR|LOG_BIOS,"CMOS:WRite to unhandled register %x",cmos.reg);
+		LOG(LOG_ERROR|LOG_BIOS,"CMOS:WRite to unhandled register %x",cmos.reg);
 	}
 }
 
+
+#define MAKE_RETURN(_VAL) (cmos.bcd ? (((_VAL / 10) << 4) | (_VAL % 10)) : _VAL);
+
 static Bit8u cmos_readreg(Bit32u port) {
 	if (cmos.reg>0x3f) {
 		LOG(LOG_ERROR|LOG_BIOS,"CMOS:Read from illegal register %x",cmos.reg);
 		return 0xff;
 	}
+	time_t curtime;
+	struct tm *loctime;
+
+	/* Get the current time. */
+	curtime = time (NULL);
+
+	/* Convert it to local time representation. */
+	loctime = localtime (&curtime);
+
 	switch (cmos.reg) {
+	case 0x00:		/* Seconds */
+		return 	MAKE_RETURN(loctime->tm_sec);
+	case 0x02:		/* Minutes */
+		return 	MAKE_RETURN(loctime->tm_min);
+	case 0x04:		/* Hours */
+		return 	MAKE_RETURN(loctime->tm_hour);
+	case 0x06:		/* Day of week */
+		return 	MAKE_RETURN(loctime->tm_wday);
+	case 0x07:		/* Date of month */
+		return 	MAKE_RETURN(loctime->tm_mday);
+	case 0x08:		/* Month */
+		return 	MAKE_RETURN(loctime->tm_mon);
+	case 0x09:		/* Year */
+		return 	MAKE_RETURN(loctime->tm_year);
+	case 0x01:		/* Seconds Alarm */
+	case 0x03:		/* Minutes Alarm */
+	case 0x05:		/* Hours Alarm */
+		return cmos.regs[cmos.reg];
 	case 0x0c:
 		if (cmos.ack) return 0;
 		else {
 			cmos.ack=true;
 			return 0x80|cmos.status_c;
 		}
+	case 0x0f:		/* Shutdown status byte */
+	case 0x17:		/* Extended memory in KB Low Byte */
+	case 0x18:		/* Extended memory in KB High Byte */
+	case 0x30:		/* Extended memory in KB Low Byte */
+	case 0x31:		/* Extended memory in KB High Byte */
+		return cmos.regs[cmos.reg];
 	default:
+		LOG(LOG_BIOS,"CMOS:Read from reg %F",cmos.reg);
 		return cmos.regs[cmos.reg];
 	}
 }
@@ -117,6 +163,13 @@ void CMOS_Init(Section* sec) {
 	cmos.timer.enabled=false;
 	cmos.reg=0xa;
 	cmos_writereg(0x71,0x26);
-
+	cmos.reg=0xb;
+	cmos_writereg(0x71,0);
+	/* Fill in extended memory size */
+	Bitu exsize=MEM_TotalSize()-1024;
+	cmos.regs[0x17]=(Bit8u)exsize;
+	cmos.regs[0x18]=(Bit8u)(exsize >> 8);
+	cmos.regs[0x30]=(Bit8u)exsize;
+	cmos.regs[0x31]=(Bit8u)(exsize >> 8);
 }