diff --git a/desmume/src/windows/main.cpp b/desmume/src/windows/main.cpp
index 51059d7ed..355c5d483 100644
--- a/desmume/src/windows/main.cpp
+++ b/desmume/src/windows/main.cpp
@@ -5956,13 +5956,21 @@ DOKEYDOWN:
 			WritePrivateProfileInt("Display", "ScreenGapColor", ScreenGapColor, IniName);
 			break;
 		case IDM_WEBSITE:
-			ShellExecute(NULL, "open", "http://desmume.sourceforge.net", NULL, NULL, SW_SHOWNORMAL);
+			ShellExecute(NULL, "open", "http://desmume.org", NULL, NULL, SW_SHOWNORMAL);
 			return 0;
 
 		case IDM_FORUM:
 			ShellExecute(NULL, "open", "http://forums.desmume.org/index.php", NULL, NULL, SW_SHOWNORMAL);
 			return 0;
 
+		case IDM_WIKI:
+			ShellExecute(NULL, "open", "http://wiki.desmume.org", NULL, NULL, SW_SHOWNORMAL);
+			return 0;
+
+		case IDM_FAQ:
+			ShellExecute(NULL, "open", "http://wiki.desmume.org/index.php?title=Faq", NULL, NULL, SW_SHOWNORMAL);
+			return 0;
+
 		case IDM_ABOUT:
 			{
 				bool tpaused=false;
@@ -5980,7 +5988,7 @@ DOKEYDOWN:
 
 #ifndef BETA_VERSION
 		case IDM_SUBMITBUGREPORT:
-			ShellExecute(NULL, "open", "http://sourceforge.net/tracker/?func=add&group_id=164579&atid=832291", NULL, NULL, SW_SHOWNORMAL);
+			ShellExecute(NULL, "open", "http://sourceforge.net/p/desmume/bugs/", NULL, NULL, SW_SHOWNORMAL);
 			return 0;
 #endif
 
diff --git a/desmume/src/windows/resource.h b/desmume/src/windows/resource.h
index c2ebf95f6..35d70c7d6 100644
--- a/desmume/src/windows/resource.h
+++ b/desmume/src/windows/resource.h
@@ -945,6 +945,8 @@
 #define ID_CLOSE                        40111
 #define ID_STREAMFROMDISK               40111
 #define ID_FSNITRO_VIEW                 40112
+#define IDM_FAQ                         40116
+#define IDM_WIKI                        40117
 #define ID_LABEL_HK3b                   44670
 #define ID_LABEL_HK3c                   44671
 #define ID_LABEL_HK3d                   44672
@@ -1051,7 +1053,7 @@
 #ifndef APSTUDIO_READONLY_SYMBOLS
 #define _APS_NO_MFC                     1
 #define _APS_NEXT_RESOURCE_VALUE        128
-#define _APS_NEXT_COMMAND_VALUE         40111
+#define _APS_NEXT_COMMAND_VALUE         40118
 #define _APS_NEXT_CONTROL_VALUE         1059
 #define _APS_NEXT_SYMED_VALUE           101
 #endif
diff --git a/desmume/src/windows/resources.rc b/desmume/src/windows/resources.rc
index 69f4bc491..8e5d42eaa 100644
--- a/desmume/src/windows/resources.rc
+++ b/desmume/src/windows/resources.rc
@@ -1757,6 +1757,9 @@ BEGIN
     BEGIN
         MENUITEM "&Website",                    IDM_WEBSITE
         MENUITEM "&Forums",                     IDM_FORUM
+        MENUITEM "W&iki",                       IDM_WIKI
+        MENUITEM "&FAQ",                        IDM_FAQ
+        MENUITEM SEPARATOR
         MENUITEM "&Submit a bug report",        IDM_SUBMITBUGREPORT
         MENUITEM "&About",                      IDM_ABOUT
     END