diff --git a/src/GPU3D.cpp b/src/GPU3D.cpp
index 4e6ac424..fd8d3200 100644
--- a/src/GPU3D.cpp
+++ b/src/GPU3D.cpp
@@ -608,6 +608,22 @@ void DoSavestate(Savestate* file)
         // might cause a blank frame but atleast it won't shit itself
         RenderNumPolygons = 0;
     }
+
+    file->VarArray(CurVertex, sizeof(s16)*3);
+    file->VarArray(VertexColor, sizeof(u8)*3);
+    file->VarArray(TexCoords, sizeof(s16)*2);
+    file->VarArray(RawTexCoords, sizeof(s16)*2);
+    file->VarArray(Normal, sizeof(s16)*3);
+
+    file->VarArray(LightDirection, sizeof(s16)*4*3);
+    file->VarArray(LightColor, sizeof(u8)*4*3);
+    file->VarArray(MatDiffuse, sizeof(u8)*3);
+    file->VarArray(MatAmbient, sizeof(u8)*3);
+    file->VarArray(MatSpecular, sizeof(u8)*3);
+    file->VarArray(MatEmission, sizeof(u8)*3);
+
+    file->Bool32(&UseShininessTable);
+    file->VarArray(ShininessTable, 128*sizeof(u8));
 }
 
 
diff --git a/src/Savestate.h b/src/Savestate.h
index c3c2e1d0..ae8fced1 100644
--- a/src/Savestate.h
+++ b/src/Savestate.h
@@ -22,7 +22,7 @@
 #include <stdio.h>
 #include "types.h"
 
-#define SAVESTATE_MAJOR 6
+#define SAVESTATE_MAJOR 7
 #define SAVESTATE_MINOR 0
 
 class Savestate