diff --git a/trunk/src/drivers/win/debuggersp.cpp b/trunk/src/drivers/win/debuggersp.cpp
index 6b9bc0a9..abde934d 100644
--- a/trunk/src/drivers/win/debuggersp.cpp
+++ b/trunk/src/drivers/win/debuggersp.cpp
@@ -31,6 +31,7 @@
 #include <assert.h>
 
 int GetNesFileAddress(int A);
+int RegNameCount;
 
 inline int RomPageIndexForAddress(int addr) { return (addr-0x8000)>>(debuggerPageSize); }
 
@@ -61,6 +62,41 @@ char delimiterChar[2] = "#";
 extern BOOL CALLBACK nameBookmarkCallB(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
 extern char bookmarkDescription[];
 
+MemoryMappedRegister RegNames[] = {
+	{"$2000", "PPU_CTRL_REG1"},
+	{"$2001", "PPU_CTRL_REG2"},
+	{"$2002", "PPU_STATUS"},
+	{"$2003", "PPU_SPR_ADDR"},
+	{"$2004", "PPU_SPR_DATA"},
+	{"$2005", "PPU_SCROLL_REG"},
+	{"$2006", "PPU_ADDRESS"},
+	{"$2007", "PPU_DATA"},
+	{"$4000", "SQ1_VOL"},
+	{"$4001", "SQ1_SWEEP"},
+	{"$4002", "SQ1_LO"},
+	{"$4003", "SQ1_HI"},
+	{"$4004", "SQ2_VOL"},
+	{"$4005", "SQ2_SWEEP"},
+	{"$4006", "SQ2_LO"},
+	{"$4007", "SQ2_HI"},
+	{"$4008", "TRI_LINEAR"},
+//	{"$4009", "UNUSED"},
+	{"$400A", "TRI_LO"},
+	{"$400B", "TRI_HI"},
+	{"$400C", "NOISE_VOL"},
+//	{"$400D", "UNUSED"},
+	{"$400E", "NOISE_LO"},
+	{"$400F", "NOISE_HI"},
+	{"$4010", "DMC_FREQ"},
+	{"$4011", "DMC_RAW"},
+	{"$4012", "DMC_START"},
+	{"$4013", "DMC_LEN"},
+	{"$4014", "OAM_DMA"},
+	{"$4015", "SND_CHN"},
+	{"$4016", "JOY1"},
+	{"$4017", "JOY2"}
+};
+
 /**
 * Tests whether a char is a valid hexadecimal character.
 * 
@@ -492,7 +528,7 @@ void replaceNames(Name* list, char* str, std::vector<uint16>* addressesLog)
 			*buff = 0;
 			src = str;
 
-			while ((pos = strstr(src, list->offset)))
+			while (pos = strstr(src, list->offset))
 			{
 				*pos = 0;
 				strcat(buff, src);
@@ -511,6 +547,23 @@ void replaceNames(Name* list, char* str, std::vector<uint16>* addressesLog)
 		}
 		list = list->next;
 	}
+
+	for (int i = 0; i < RegNameCount; i++) {
+		// copypaste, because Name* is too complex to abstract
+		*buff = 0;
+		src = str;
+
+		while (pos = strstr(src, RegNames[i].offset)) {
+			*pos = 0;
+			strcat(buff, src);
+			strcat(buff, RegNames[i].name);
+			src = pos + 5;
+		}
+		if (*buff) {
+			strcat(buff, src);
+			strcpy(str, buff);
+		}
+	}
 }
 
 /**
@@ -593,6 +646,7 @@ void setNamesPointerForAddress(uint16 address, Name* newNode)
 void loadNameFiles()
 {
 	int cb;
+	RegNameCount = sizeof(RegNames)/sizeof(MemoryMappedRegister);
 
 	if (!ramBankNamesLoaded)
 	{
diff --git a/trunk/src/drivers/win/debuggersp.h b/trunk/src/drivers/win/debuggersp.h
index 46b1732e..afaf7cfc 100644
--- a/trunk/src/drivers/win/debuggersp.h
+++ b/trunk/src/drivers/win/debuggersp.h
@@ -33,6 +33,12 @@ struct Name
 	char* comment;
 };
 
+struct MemoryMappedRegister
+{
+	char* offset;
+	char* name;
+};
+
 extern bool symbDebugEnabled;
 extern std::vector<unsigned int> bookmarks_addr;
 extern std::vector<std::string> bookmarks_name;
diff --git a/trunk/src/drivers/win/memview.cpp b/trunk/src/drivers/win/memview.cpp
index 538dfc2a..0c5e5dc0 100644
--- a/trunk/src/drivers/win/memview.cpp
+++ b/trunk/src/drivers/win/memview.cpp
@@ -43,6 +43,8 @@
 extern Name* lastBankNames;
 extern Name* loadedBankNames;
 extern Name* ramBankNames;
+extern int RegNameCount;
+extern MemoryMappedRegister RegNames[];
 
 extern unsigned char *cdloggervdata;
 extern unsigned int cdloggerVideoDataSize;
@@ -639,6 +641,14 @@ void UpdateCaption()
 				strcat(str, " - ");
 				strcat(str, node->name);
 			}
+			for (int i = 0; i < RegNameCount; i++) {
+				int test = 0;
+				sscanf(RegNames[i].offset, "$%4x", &test);
+				if (test == CursorStartAddy) {
+					strcat(str, " - ");
+					strcat(str, RegNames[i].name);
+				}
+			}
 		}
 	} else
 	{