diff --git a/trunk/desmume/src/windows/DeSmuME.dev b/trunk/desmume/src/windows/DeSmuME.dev
index e649abd31..5818e4f79 100644
--- a/trunk/desmume/src/windows/DeSmuME.dev
+++ b/trunk/desmume/src/windows/DeSmuME.dev
@@ -1,7 +1,7 @@
 [Project]
 FileName=DeSmuME.dev
 Name=DeSmuME
-UnitCount=48
+UnitCount=50
 Type=0
 Ver=1
 ObjFiles=
@@ -12,7 +12,7 @@ ResourceIncludes=
 MakeIncludes=
 Compiler=
 CppCompiler=-DVERSION=\"0.3.3\"_@@_
-Linker=
+Linker=-lz -lz.dll_@@_
 IsCpp=1
 Icon=
 ExeOutput=
@@ -398,9 +398,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit49]
-FileName=yopyop_private.h
+FileName=saves.cpp
 CompileCpp=1
-Folder=
+Folder=DeSmuME
 Compile=1
 Link=1
 Priority=1000
@@ -408,9 +408,9 @@ OverrideBuildCmd=0
 BuildCmd=
 
 [Unit50]
-FileName=yopyop_private.hpp
+FileName=saves.hpp
 CompileCpp=1
-Folder=
+Folder=DeSmuME
 Compile=1
 Link=1
 Priority=1000
diff --git a/trunk/desmume/src/windows/resource.h b/trunk/desmume/src/windows/resource.h
index 936ed5e7a..75ca17812 100644
--- a/trunk/desmume/src/windows/resource.h
+++ b/trunk/desmume/src/windows/resource.h
@@ -66,6 +66,9 @@ void refreshAll();
 #define IDM_PRINTSCREEN          140
 #define IDM_QUICK_PRINTSCREEN    141
 
+#define IDM_STATE_LOAD      150
+#define IDM_STATE_SAVE      151
+
 #define IDD_MEM_VIEWER      301
 #define IDC_8_BIT           302
 #define IDC_16_BIT          303
diff --git a/trunk/desmume/src/windows/resources.rc b/trunk/desmume/src/windows/resources.rc
index 6262ae800..ec2882bf1 100644
--- a/trunk/desmume/src/windows/resources.rc
+++ b/trunk/desmume/src/windows/resources.rc
@@ -294,6 +294,9 @@ MENU_PRINCIPAL MENU
   MENUITEM "&Open", IDM_OPEN
   MENUITEM "Rom &Info", IDM_GAME_INFO
   MENUITEM SEPARATOR
+  MENUITEM "Save State", IDM_STATE_SAVE
+  MENUITEM "Load State", IDM_STATE_LOAD
+  MENUITEM SEPARATOR
   MENUITEM "Save Screenshot &As", IDM_PRINTSCREEN
   MENUITEM "&Quick Screenshot", IDM_QUICK_PRINTSCREEN
   MENUITEM SEPARATOR