diff --git a/servers/pokeapi/server.yaml b/servers/pokeapi/server.yaml
new file mode 100644
index 00000000..5529b76e
--- /dev/null
+++ b/servers/pokeapi/server.yaml
@@ -0,0 +1,19 @@
+name: pokeapi
+image: joereg4/pokeapi-mcp-server:latest
+type: server
+meta:
+  category: entertainment
+  tags:
+    - pokemon
+    - gaming
+    - api
+    - entertainment
+    - data
+about:
+  title: PokeAPI MCP Server
+  description: Access comprehensive Pokémon data from PokeAPI with 9 specialized tools for stats, evolution chains, type effectiveness, and more
+  icon: https://raw.githubusercontent.com/PokeAPI/sprites/master/sprites/pokemon/25.png
+source:
+  project: https://github.com/joereg4/pokeapi-mcp-server
+config:
+  description: No configuration required - connects directly to public PokeAPI
diff --git a/servers/pokeapi/tools.json b/servers/pokeapi/tools.json
new file mode 100644
index 00000000..8d8495b6
--- /dev/null
+++ b/servers/pokeapi/tools.json
@@ -0,0 +1,101 @@
+[
+  {
+    "name": "get_pokemon",
+    "description": "Get detailed Pokémon information including stats, types, abilities, and sprites by name or ID",
+    "arguments": [
+      {
+        "name": "identifier",
+        "type": "string",
+        "desc": "Pokémon name or ID (e.g., 'pikachu' or '25')"
+      }
+    ]
+  },
+  {
+    "name": "get_pokemon_species",
+    "description": "Get species data including flavor text, evolution info, and capture rate",
+    "arguments": [
+      {
+        "name": "identifier",
+        "type": "string",
+        "desc": "Pokémon species name or ID"
+      }
+    ]
+  },
+  {
+    "name": "get_evolution_chain",
+    "description": "Get complete evolution chain information by chain ID",
+    "arguments": [
+      {
+        "name": "chain_id",
+        "type": "string",
+        "desc": "Evolution chain ID (e.g., '1' for Bulbasaur line)"
+      }
+    ]
+  },
+  {
+    "name": "get_type",
+    "description": "Get type effectiveness and damage relations for Pokémon types",
+    "arguments": [
+      {
+        "name": "identifier",
+        "type": "string",
+        "desc": "Type name (e.g., 'fire', 'water', 'electric')"
+      }
+    ]
+  },
+  {
+    "name": "get_machine",
+    "description": "Get TM/HM/TR information including moves and availability",
+    "arguments": [
+      {
+        "name": "machine_id",
+        "type": "string",
+        "desc": "Machine ID (e.g., '1' for TM01)"
+      }
+    ]
+  },
+  {
+    "name": "get_pokedex",
+    "description": "Get Pokédex entries and descriptions",
+    "arguments": [
+      {
+        "name": "identifier",
+        "type": "string",
+        "desc": "Pokédex name or ID (e.g., 'national', 'kanto')"
+      }
+    ]
+  },
+  {
+    "name": "get_move",
+    "description": "Get move information including power, accuracy, and effects",
+    "arguments": [
+      {
+        "name": "identifier",
+        "type": "string",
+        "desc": "Move name or ID (e.g., 'thunderbolt', 'tackle')"
+      }
+    ]
+  },
+  {
+    "name": "get_ability",
+    "description": "Get ability information including effects and Pokémon that have it",
+    "arguments": [
+      {
+        "name": "identifier",
+        "type": "string",
+        "desc": "Ability name or ID (e.g., 'static', 'overgrow')"
+      }
+    ]
+  },
+  {
+    "name": "get_item",
+    "description": "Get item information including effects and usage",
+    "arguments": [
+      {
+        "name": "identifier",
+        "type": "string",
+        "desc": "Item name or ID (e.g., 'poke-ball', 'master-ball')"
+      }
+    ]
+  }
+]