diff --git a/AUTHORS b/AUTHORS
index 9129bbd2d5..1c04199ff4 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -56,3 +56,6 @@ Gražvydas Ignotas -
 
 Saggi Mizrahi - 
    - RetroLaunch utility
+
+Alfred Agrell - <floating@muncher.se>
+   - Rewritten savestate manager
diff --git a/rewind.c b/rewind.c
index 6bff280723..a10624af30 100644
--- a/rewind.c
+++ b/rewind.c
@@ -215,8 +215,8 @@ bool state_manager_pop(state_manager_t *state, void **data)
 
 void *state_manager_push_where(state_manager_t *state)
 {
-   //We need to ensure we have an uncompressed copy of the last pushed state, or we could end up
-   // applying a 'patch' to wrong savestate, and that'd blow up rather quickly.
+   //We need to ensure we have an uncompressed copy of the last pushed state, or we could
+   // end up applying a 'patch' to wrong savestate, and that'd blow up rather quickly.
    if (!state->thisblock_valid) 
    {
       void *ignore;