diff --git a/pcsx2/PAD/Linux/PAD.cpp b/pcsx2/PAD/Linux/PAD.cpp
index 00d5ac25cd..8409576e6c 100644
--- a/pcsx2/PAD/Linux/PAD.cpp
+++ b/pcsx2/PAD/Linux/PAD.cpp
@@ -19,6 +19,7 @@
 #include <string.h>
 #include <stdarg.h>
 
+#include "Utilities/pxStreams.h"
 #include "keyboard.h"
 #include "PAD.h"
 #include "state_management.h"
@@ -293,3 +294,49 @@ void PADWriteEvent(keyEvent& evt)
 	g_ev_fifo.push(evt);
 }
 #endif
+
+void PADDoFreezeOut(void* dest)
+{
+	freezeData fP = {0, (s8*)dest};
+	if (PADfreeze(FREEZE_SIZE, &fP) != 0)
+		return;
+	if (!fP.size)
+		return;
+
+	Console.Indent().WriteLn("Saving PAD");
+
+	if (PADfreeze(FREEZE_SAVE, &fP) != 0)
+		throw std::runtime_error(" * PAD: Error saving state!\n");
+}
+
+
+void PADDoFreezeIn(pxInputStream& infp)
+{
+	freezeData fP = {0, nullptr};
+	if (PADfreeze(FREEZE_SIZE, &fP) != 0)
+		fP.size = 0;
+
+	Console.Indent().WriteLn("Loading PAD");
+
+	if (!infp.IsOk() || !infp.Length())
+	{
+		// no state data to read, but PAD expects some state data?
+		// Issue a warning to console...
+		if (fP.size != 0)
+			Console.Indent().Warning("Warning: No data for PAD found. Status may be unpredictable.");
+
+		return;
+
+		// Note: Size mismatch check could also be done here on loading, but
+		// some plugins may have built-in version support for non-native formats or
+		// older versions of a different size... or could give different sizes depending
+		// on the status of the plugin when loading, so let's ignore it.
+	}
+
+	ScopedAlloc<s8> data(fP.size);
+	fP.data = data.GetPtr();
+
+	infp.Read(fP.data, fP.size);
+	if (PADfreeze(FREEZE_LOAD, &fP) != 0)
+		throw std::runtime_error(" * PAD: Error loading state!\n");
+}
diff --git a/pcsx2/PAD/Linux/PAD.h b/pcsx2/PAD/Linux/PAD.h
index 640722fa67..4a578aac02 100644
--- a/pcsx2/PAD/Linux/PAD.h
+++ b/pcsx2/PAD/Linux/PAD.h
@@ -138,6 +138,8 @@ u8 PADpoll(u8 value);
 keyEvent* PADkeyEvent();
 void PADupdate(int pad);
 void PADconfigure();
+void PADDoFreezeOut(void* dest);
+void PADDoFreezeIn(pxInputStream& infp);
 
 #if defined(__unix__)
 void PADWriteEvent(keyEvent& evt);
diff --git a/pcsx2/SaveState.h b/pcsx2/SaveState.h
index 8d993d0ac6..d922015563 100644
--- a/pcsx2/SaveState.h
+++ b/pcsx2/SaveState.h
@@ -24,7 +24,7 @@
 //  the lower 16 bit value.  IF the change is breaking of all compatibility with old
 //  states, increment the upper 16 bit value, and clear the lower 16 bits to 0.
 
-static const u32 g_SaveVersion = (0x9A12 << 16) | 0x0000;
+static const u32 g_SaveVersion = (0x9A13 << 16) | 0x0000;
 
 // this function is meant to be used in the place of GSfreeze, and provides a safe layer
 // between the GS saving function and the MTGS's needs. :)
diff --git a/pcsx2/gui/SysState.cpp b/pcsx2/gui/SysState.cpp
index c644f27854..7683cb8a66 100644
--- a/pcsx2/gui/SysState.cpp
+++ b/pcsx2/gui/SysState.cpp
@@ -25,6 +25,7 @@
 #include "Utilities/pxStreams.h"
 #include "SPU2/spu2.h"
 #include "USB/USB.h"
+#include "PAD/Linux/PAD.h"
 
 #include "ConsoleLogger.h"
 
@@ -286,6 +287,27 @@ public:
 	bool IsRequired() const { return true; }
 };
 
+class SavestateEntry_PAD : public BaseSavestateEntry
+{
+public:
+	virtual ~SavestateEntry_PAD() = default;
+
+	wxString GetFilename() const { return L"PAD.bin"; }
+	void FreezeIn(pxInputStream& reader) const { return PADDoFreezeIn(reader); }
+	void FreezeOut(SaveStateBase& writer) const
+	{
+		freezeData fP = {0, NULL};
+		if (PADfreeze(FREEZE_SIZE, &fP) == 0)
+		{
+			const int size = fP.size;
+			writer.PrepBlock(size);
+			PADDoFreezeOut(writer.GetBlockPtr());
+			writer.CommitBlock(size);
+		}
+		return;
+	}
+	bool IsRequired() const { return true; }
+};
 
 
 
@@ -310,6 +332,7 @@ static const std::unique_ptr<BaseSavestateEntry> SavestateEntries[] = {
 	std::unique_ptr<BaseSavestateEntry>(new SavestateEntry_VU1prog),
 	std::unique_ptr<BaseSavestateEntry>(new SavestateEntry_SPU2),
 	std::unique_ptr<BaseSavestateEntry>(new SavestateEntry_USB),
+	std::unique_ptr<BaseSavestateEntry>(new SavestateEntry_PAD),
 
 	std::unique_ptr<BaseSavestateEntry>(new PluginSavestateEntry(PluginId_GS)),
 };