diff --git a/CHANGES b/CHANGES
index bcbe0cb1e..2a498abd6 100644
--- a/CHANGES
+++ b/CHANGES
@@ -8,6 +8,7 @@ Bugfixes:
  - GBA: Deinit savegame when unloading a ROM
 Misc:
  - Qt: Remove useless help icons in dialogs
+ - GBA: Attempting to save a screenshot-style savestate should be allowed without libpng
 
 0.3.0: (2015-08-16)
 Features:
diff --git a/src/gba/serialize.c b/src/gba/serialize.c
index 96e7c0daa..730ce5b59 100644
--- a/src/gba/serialize.c
+++ b/src/gba/serialize.c
@@ -300,7 +300,11 @@ bool GBALoadState(struct GBAThread* threadContext, struct VDir* dir, int slot) {
 }
 
 bool GBASaveStateNamed(struct GBA* gba, struct VFile* vf, bool screenshot) {
+#ifdef USE_PNG
 	if (!screenshot) {
+#else
+	UNUSED(screenshot);
+#endif
 		vf->truncate(vf, sizeof(struct GBASerializedState));
 		struct GBASerializedState* state = vf->map(vf, sizeof(struct GBASerializedState), MAP_WRITE);
 		if (!state) {
@@ -309,8 +313,8 @@ bool GBASaveStateNamed(struct GBA* gba, struct VFile* vf, bool screenshot) {
 		GBASerialize(gba, state);
 		vf->unmap(vf, state, sizeof(struct GBASerializedState));
 		return true;
-	}
 #ifdef USE_PNG
+	}
 	else {
 		return _savePNGState(gba, vf);
 	}