diff --git a/CHANGES b/CHANGES
index bd9c431d6..ff267b99e 100644
--- a/CHANGES
+++ b/CHANGES
@@ -13,6 +13,7 @@ Misc:
  - Qt: Remove useless help icons in dialogs
  - ARM7: Combine shifter-immediate and shifter-register functions to reduce binary size
  - SDL: Support fullscreen in SDL 1.2
+ - 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 37d6cce36..48765cbfa 100644
--- a/src/gba/serialize.c
+++ b/src/gba/serialize.c
@@ -304,7 +304,11 @@ bool GBALoadState(struct GBAThread* threadContext, struct VDir* dir, int slot) {
 #endif
 
 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) {
@@ -313,8 +317,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);
 	}