diff --git a/es-app/assets/Windows_Portable_README.txt b/es-app/assets/Windows_Portable_README.txt
index e7a9db243..5967c5a56 100644
--- a/es-app/assets/Windows_Portable_README.txt
+++ b/es-app/assets/Windows_Portable_README.txt
@@ -99,6 +99,7 @@ Emulators\VICE\x64sc.exe
 Emulators\VICE\bin\x64sc.exe
 Emulators\VICE\xvic.exe
 Emulators\VICE\bin\xvic.exe
+Emulators\Visual Pinball\VPinballX.exe
 Emulators\Vita3K\Vita3K.exe
 Emulators\xemu\xemu.exe
 Emulators\xenia\xenia.exe
diff --git a/es-app/src/PlatformId.cpp b/es-app/src/PlatformId.cpp
index 94ef59173..e4d8b2bc5 100644
--- a/es-app/src/PlatformId.cpp
+++ b/es-app/src/PlatformId.cpp
@@ -140,6 +140,7 @@ namespace PlatformIds
         "vic20",                // Commodore VIC-20
         "videopac",             // Philips Videopac G7000 (Magnavox Odyssey2)
         "virtualboy",           // Nintendo Virtual Boy
+        "vpinball",             // Visual Pinball
         "vsmile",               // VTech V.Smile
         "wasm4",                // WASM-4 Fantasy Console
         "wii",                  // Nintendo Wii
diff --git a/es-app/src/PlatformId.h b/es-app/src/PlatformId.h
index 85c87f4cd..4c2cc5551 100644
--- a/es-app/src/PlatformId.h
+++ b/es-app/src/PlatformId.h
@@ -139,6 +139,7 @@ namespace PlatformIds
         COMMODORE_VIC20,
         PHILIPS_VIDEOPAC,
         NINTENDO_VIRTUAL_BOY,
+        VISUAL_PINBALL,
         VTECH_VSMILE,
         GAMEENGINE_WASM4,
         NINTENDO_WII,
diff --git a/es-app/src/scrapers/ScreenScraper.cpp b/es-app/src/scrapers/ScreenScraper.cpp
index 5ace1a4e3..cce4c2360 100644
--- a/es-app/src/scrapers/ScreenScraper.cpp
+++ b/es-app/src/scrapers/ScreenScraper.cpp
@@ -153,6 +153,7 @@ namespace
         {THOMSON_MOTO, 141},
         {UZEBOX, 216},
         {FUTURE_PINBALL, 199},
+        {VISUAL_PINBALL, 198},
         {WATARA_SUPERVISION, 207},
         {SPECTRAVIDEO, 218},
         {PALM_OS, 219}};
diff --git a/resources/sorting/hwtype_year/es_systems_sorting.xml b/resources/sorting/hwtype_year/es_systems_sorting.xml
index 1d65d4094..2cbef91e0 100644
--- a/resources/sorting/hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/hwtype_year/es_systems_sorting.xml
@@ -649,6 +649,10 @@
         <name>virtualboy</name>
         <systemsortname>Portable - 1995</systemsortname>
     </system>
+    <system>
+        <name>vpinball</name>
+        <systemsortname>Engine - 2000</systemsortname>
+    </system>
     <system>
         <name>vsmile</name>
         <systemsortname>Console - 2004</systemsortname>
diff --git a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
index 3f4b5d6a1..2c3dbf532 100644
--- a/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_hwtype_year/es_systems_sorting.xml
@@ -649,6 +649,10 @@
         <name>virtualboy</name>
         <systemsortname>Nintendo - Portable - 1995</systemsortname>
     </system>
+    <system>
+        <name>vpinball</name>
+        <systemsortname>Visual Pinball Team - Engine - 2000</systemsortname>
+    </system>
     <system>
         <name>vsmile</name>
         <systemsortname>VTech - Console - 2004</systemsortname>
diff --git a/resources/sorting/manufacturer_year/es_systems_sorting.xml b/resources/sorting/manufacturer_year/es_systems_sorting.xml
index 82d724dfc..044054e3e 100644
--- a/resources/sorting/manufacturer_year/es_systems_sorting.xml
+++ b/resources/sorting/manufacturer_year/es_systems_sorting.xml
@@ -649,6 +649,10 @@
         <name>virtualboy</name>
         <systemsortname>Nintendo - 1995</systemsortname>
     </system>
+    <system>
+        <name>vpinball</name>
+        <systemsortname>Visual Pinball Team - 2000</systemsortname>
+    </system>
     <system>
         <name>vsmile</name>
         <systemsortname>VTech - 2004</systemsortname>
diff --git a/resources/sorting/year/es_systems_sorting.xml b/resources/sorting/year/es_systems_sorting.xml
index c426f5bd1..43d7a9dc9 100644
--- a/resources/sorting/year/es_systems_sorting.xml
+++ b/resources/sorting/year/es_systems_sorting.xml
@@ -649,6 +649,10 @@
         <name>virtualboy</name>
         <systemsortname>1995</systemsortname>
     </system>
+    <system>
+        <name>vpinball</name>
+        <systemsortname>2000</systemsortname>
+    </system>
     <system>
         <name>vsmile</name>
         <systemsortname>2004</systemsortname>
diff --git a/resources/systems/macos/es_systems.xml b/resources/systems/macos/es_systems.xml
index 6869a0226..75ad99819 100644
--- a/resources/systems/macos/es_systems.xml
+++ b/resources/systems/macos/es_systems.xml
@@ -1762,6 +1762,15 @@
         <platform>virtualboy</platform>
         <theme>virtualboy</theme>
     </system>
+    <system>
+        <name>vpinball</name>
+        <fullname>Visual Pinball</fullname>
+        <path>%ROMPATH%/vpinball</path>
+        <extension>.vpt .VPT .vpx .VPX</extension>
+        <command label="Visual Pinball (Standalone)">PLACEHOLDER %ROM%</command>
+        <platform>vpinball</platform>
+        <theme>vpinball</theme>
+    </system>
     <system>
         <name>vsmile</name>
         <fullname>VTech V.Smile</fullname>
diff --git a/resources/systems/unix/es_systems.xml b/resources/systems/unix/es_systems.xml
index cef682a64..b20d3bbdc 100644
--- a/resources/systems/unix/es_systems.xml
+++ b/resources/systems/unix/es_systems.xml
@@ -1818,6 +1818,15 @@
         <platform>virtualboy</platform>
         <theme>virtualboy</theme>
     </system>
+    <system>
+        <name>vpinball</name>
+        <fullname>Visual Pinball</fullname>
+        <path>%ROMPATH%/vpinball</path>
+        <extension>.vpt .VPT .vpx .VPX</extension>
+        <command label="Visual Pinball (Standalone)">PLACEHOLDER %ROM%</command>
+        <platform>vpinball</platform>
+        <theme>vpinball</theme>
+    </system>
     <system>
         <name>vsmile</name>
         <fullname>VTech V.Smile</fullname>
diff --git a/resources/systems/windows/es_find_rules.xml b/resources/systems/windows/es_find_rules.xml
index 16ae9fc03..7eebe9df9 100644
--- a/resources/systems/windows/es_find_rules.xml
+++ b/resources/systems/windows/es_find_rules.xml
@@ -767,6 +767,16 @@
             <entry>%ESPATH%\..\Emulators\VICE\bin\xvic.exe</entry>
         </rule>
     </emulator>
+    <emulator name="VISUAL-PINBALL">
+        <!-- Pinball simulator Visual Pinball -->
+        <rule type="systempath">
+            <entry>VPinballX.exe</entry>
+        </rule>
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\Visual Pinball\VPinballX.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Visual Pinball\VPinballX.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="VITA3K">
         <!-- Sony PlayStation Vita emulator Vita3K -->
         <rule type="systempath">
diff --git a/resources/systems/windows/es_find_rules_portable.xml b/resources/systems/windows/es_find_rules_portable.xml
index 7b6aeffe0..e460af3e6 100644
--- a/resources/systems/windows/es_find_rules_portable.xml
+++ b/resources/systems/windows/es_find_rules_portable.xml
@@ -511,6 +511,13 @@
             <entry>%ESPATH%\..\Emulators\VICE\bin\xvic.exe</entry>
         </rule>
     </emulator>
+    <emulator name="VISUAL-PINBALL">
+        <!-- Pinball simulator Visual Pinball -->
+        <rule type="staticpath">
+            <entry>%ESPATH%\Emulators\Visual Pinball\VPinballX.exe</entry>
+            <entry>%ESPATH%\..\Emulators\Visual Pinball\VPinballX.exe</entry>
+        </rule>
+    </emulator>
     <emulator name="VITA3K">
         <!-- Sony PlayStation Vita emulator Vita3K -->
         <rule type="staticpath">
diff --git a/resources/systems/windows/es_systems.xml b/resources/systems/windows/es_systems.xml
index 0f38ab356..6eb077542 100644
--- a/resources/systems/windows/es_systems.xml
+++ b/resources/systems/windows/es_systems.xml
@@ -1820,6 +1820,15 @@
         <platform>virtualboy</platform>
         <theme>virtualboy</theme>
     </system>
+    <system>
+        <name>vpinball</name>
+        <fullname>Visual Pinball</fullname>
+        <path>%ROMPATH%\vpinball</path>
+        <extension>.vpt .VPT .vpx .VPX</extension>
+        <command label="Visual Pinball (Standalone)">%EMULATOR_VISUAL-PINBALL% -Minimized -Play %ROM%</command>
+        <platform>vpinball</platform>
+        <theme>vpinball</theme>
+    </system>
     <system>
         <name>vsmile</name>
         <fullname>VTech V.Smile</fullname>